; Use $GIT_DIR to find the .git directory inside our hooks

This resolves an issue with running the hooks from a worktree.  See
<https://lists.gnu.org/archive/html/emacs-devel/2023-05/msg00000.html>.

* build-aux/git-hooks/post-commit:
* build-aux/git-hooks/pre-push: Use $GIT_DIR.

diff --git a/build-aux/git-hooks/post-commit b/build-aux/git-hooks/post-commit
index 68d9995d91567bcd8fbf95110d38eb39cab8d35b..05f2d778b5c27fe3d9321ca7e5ad21c79b170188 100755 (executable)
--- a/build-aux/git-hooks/post-commit
+++ b/build-aux/git-hooks/post-commit
@@ -42,4 +42,4 @@ else
 fi
 
 git rev-parse HEAD | $awk -v reason=post-commit \
-                          -f .git/hooks/commit-msg-files.awk
+                          -f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk

diff --git a/build-aux/git-hooks/pre-push b/build-aux/git-hooks/pre-push
index 8e8277cba4f84dbde1e4ca8c88133064a26ad510..6ff59102fd79ebcb79360f2646afad26b3dc5b1e 100755 (executable)
--- a/build-aux/git-hooks/pre-push
+++ b/build-aux/git-hooks/pre-push
@@ -83,4 +83,4 @@ $awk -v origin_name="$1" '
     # Print every SHA after oldref, up to (and including) newref.
     system("git rev-list --first-parent --reverse " oldref ".." newref)
   }
-' | $awk -v reason=pre-push -f .git/hooks/commit-msg-files.awk
+' | $awk -v reason=pre-push -f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk