diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-12 08:34:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-12 08:34:17 -0500 |
| commit | 9b2e0604a92aa319b78f3c22227a395b83698ab0 (patch) | |
| tree | 5ac93d6c9cd42a918be3b84551bb4d1ab4070274 | |
| parent | bc493ce0f2130c5f2bc37e62600c45665ffc9d57 (diff) | |
| parent | 99d957696b3274a334448f066ba418b51cc887ee (diff) | |
| download | tor-9b2e0604a92aa319b78f3c22227a395b83698ab0.tar.gz tor-9b2e0604a92aa319b78f3c22227a395b83698ab0.zip | |
Merge remote-tracking branch 'tor-github/pr/1726/head'
| -rw-r--r-- | changes/bug33284 | 4 | ||||
| -rwxr-xr-x | scripts/git/pre-push.git-hook | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/changes/bug33284 b/changes/bug33284 new file mode 100644 index 0000000000..e6aed4d2d4 --- /dev/null +++ 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 index 7b06f3734d..efa45b9860 100755 --- 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 |