From 0f97f15a8d183c6b14894f47c40968e92104181d Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Wed, 23 Jan 2019 18:41:55 +0000 Subject: Removing files ending with a ~ in the git checkout hook While editing files, some editors create temporary `~' files that can cause problems in metastore's ability to delete their host directory if its not on the other branch. With this commit, a `find' call was added to the post checkout Git hook to remove such temporary files before metastore is called. Also, some comments were added to both git hooks to make them easier to understand for a beginner. --- reproduce/src/make/dependencies.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'reproduce/src/make') diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index e9023b4..1cc2b00 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -384,9 +384,10 @@ $(ibdir)/metastore: $(tdir)/metastore-$(metastore-version).tar.gz \ cd $$current_dir if [ -f $@ ]; then for f in pre-commit post-checkout; do - sed -e's|@USER[@]|'$$user'|g' \ - -e's|@GROUP[@]|'$$group'|g' \ - -e's|@BINDIR[@]|$(ibdir)|g' \ + sed -e's|@USER[@]|'$$user'|g' \ + -e's|@GROUP[@]|'$$group'|g' \ + -e's|@BINDIR[@]|$(ibdir)|g' \ + -e's|@TOP_PROJECT_DIR[@]|'$$current_dir'|g' \ reproduce/src/bash/git-$$f > .git/hooks/$$f chmod +x .git/hooks/$$f done -- cgit v1.2.1