nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripts/git: Stop running the checked-out git scripts

Browse Source 
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.
This commit is contained in:
teor 2020-02-12 20:32:58 +10:00
parent 41a9eddf2b
commit 99d957696b
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug33284 Normal file
View File

@ -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.

9
scripts/git/pre-push.git-hook
View File

@ -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