From a1589979d16f37ec4b09b9ef3b936b4759a390b5 Mon Sep 17 00:00:00 2001 From: keton Date: Sat, 16 Mar 2024 12:00:40 +0100 Subject: [PATCH] Ignore autogenerated CommitHash header and remove it from repo (#224) This will prevent accidentally including autogenerated code and making patches that are difficult to rebase. CommitHash.hpp is autogenerated by cmake and shouldn't be commited. Additionally someone with write access should do `git filter-branch` and remove CommitHash.hpp from the previous history or this problem may come back with merging older patches. --- .gitignore | 5 ++++- CMakeLists.txt | 1 - src/CommitHash.hpp | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/CommitHash.hpp diff --git a/.gitignore b/.gitignore index bdc0319b..f2c51a7f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,7 @@ build/* .vscode/* out/* -.vs/* \ No newline at end of file +.vs/* + +# Ignore autogenerated headers +src/CommitHash.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 4be5fae9..aa4a0407 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -695,7 +695,6 @@ list(APPEND uevr_SOURCES "src/uevr-imgui/imgui_impl_dx12.cpp" "src/uevr-imgui/imgui_impl_win32.cpp" "src/utility/ImGui.cpp" - "src/CommitHash.hpp" "src/ExceptionHandler.hpp" "src/Framework.hpp" "src/LicenseStrings.hpp" diff --git a/src/CommitHash.hpp b/src/CommitHash.hpp deleted file mode 100644 index 7fc70e92..00000000 --- a/src/CommitHash.hpp +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#define UEVR_COMMIT_HASH "0ffc79987629f6bd09f564ec9fe61c1a77ef7efc" -#define UEVR_BUILD_DATE "04.03.2024" -#define UEVR_BUILD_TIME "00:00"