tor

commit 9b2e0604a92aa319b78f3c22227a395b83698ab0
parent bc493ce0f2130c5f2bc37e62600c45665ffc9d57
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 12 Feb 2020 08:34:17 -0500

Merge remote-tracking branch 'tor-github/pr/1726/head'

Diffstat:
A
changes/bug33284
 | 
4
++++
M
scripts/git/pre-push.git-hook
 | 
9
+++++++--

2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/changes/bug33284 b/changes/bug33284
@@ -0,0 +1,4 @@
+  o Minor bugfixes (git scripts):
+    - Stop executing the checked-out pre-commit hook from the pre-push hook.
+      Instead, execute the copy in the user's git dir. Fixes bug 33284; bugfix
+      on 0.4.1.1-alpha.
diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook
@@ -26,7 +26,11 @@ z40=0000000000000000000000000000000000000000
 
 upstream_name=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
 
+# The working directory
 workdir=$(git rev-parse --show-toplevel)
+# The .git directory
+# If $workdir is a worktree, then $gitdir is not $workdir/.git
+gitdir=$(git rev-parse --git-dir)
 
 cd "$workdir" || exit 1
 
@@ -58,7 +62,8 @@ do
         fi
 
         # Call the pre-commit hook for the common checks, if it is executable
-        if [ -x scripts/git/pre-commit.git-hook ]; then
+        pre_commit=${gitdir}/hooks/pre-commit
+        if [ -x "$pre_commit" ]; then
             # Only check the files newly modified in this branch
             CHECK_FILTER="git diff --name-only --diff-filter=ACMR $range"
             # Use the appropriate owned tor source list to filter the changed
@@ -81,7 +86,7 @@ do
             # We want word splitting here, because file names are space
             # separated
             # shellcheck disable=SC2086
-            if ! scripts/git/pre-commit.git-hook $CHECK_FILES ; then
+            if ! "$pre_commit" $CHECK_FILES ; then
                 exit 1
             fi
         fi