Unverified Commit e046903f authored by teor's avatar teor
Browse files

scripts/git: Restore a dropped check for pre-commit in pre-push 

Bugfix on 31919; not in any released version of Tor.
parent 7e73c0d5

scripts/git/pre-push.git-hook

+32 −28
Original line number Diff line number Diff line
@@ -58,9 +58,11 @@ do 
        fi



        # Call the pre-commit hook for the common checks, if it is executable

        if [ -x scripts/git/pre-commit.git-hook ]; 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 files

            # Use the appropriate owned tor source list to filter the changed

            # files

            if [ -d src/lib ]; then

                # This is the layout in 0.3.5

                CHECK_FILES="$($CHECK_FILTER \
@@ -83,11 +85,13 @@ do 
                              )"

            fi



        # We want word splitting here, because file names are space separated

            # We want word splitting here, because file names are space

            # separated

            # shellcheck disable=SC2086

            if ! scripts/git/pre-commit.git-hook $CHECK_FILES ; then

                exit 1

            fi

        fi



        if [[ "$remote_name" != "$upstream_name" ]]; then

            echo "Not pushing to upstream - refraining from further checks"