Skip to content

Commit 5b2ce4d

Browse files
committed
Disable LLVM_MAIN_REVISION update in post-merge hook
- LLVM_MAIN_REVISION update in post-merge hook causes divergence in development workspace - Combination like git reset + git pull + git pull causes issues - This temporay patch makes post-merge hook a no-op Change-Id: Ic0f89da06301ad9eae0234d39a0dc8d319b2fa60
1 parent 5fa9679 commit 5b2ce4d

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

amd/git-hooks/llvm-main-revision

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ if test "$ACTION_TYPE" = "pre-commit"; then
1616
fi
1717
fi
1818

19+
#disable automatic llvm-config.h.cmake LLVM_MAIN_REVISION update
20+
exit 0
21+
1922
LLVM_CONFIG_H_CMAKE_PATH="llvm/include/llvm/Config/llvm-config.h.cmake"
2023

2124
FETCH_HASH=$(git log --oneline --format='%h' --max-count=1 FETCH_HEAD)

0 commit comments

Comments
 (0)