From 52615e26eff9f857b946b3cc7f7f17eeffb790b8 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sat, 12 Jan 2019 00:36:14 -0800 Subject: [PATCH] makefile: remove remnant git hooks which interfere with build --- makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefile b/makefile index 8d160a07..a3fc66f3 100644 --- a/makefile +++ b/makefile @@ -226,6 +226,9 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) ACTUAL_GIT_COMMIT_ID=$(strip $(shell git log -1 --pretty="%H")) ifneq ($(CURRENT_GIT_COMMIT_ID),$(ACTUAL_GIT_COMMIT_ID)) NEED_COMMIT_ID = need-commit-id + # make sure that the invalidly formatted .git-commit-id file wasn't generated + # by legacy git hooks which need to be removed. + $(shell rm -f .git/hooks/post-checkout .git/hooks/post-commit .git/hooks/post-merge) endif else NEED_COMMIT_ID = need-commit-id