diff options
Diffstat (limited to 'scripts/git/pre-push.git-hook')
| -rwxr-xr-x | scripts/git/pre-push.git-hook | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 8b5efb0a9d..7b06f3734d 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -63,13 +63,12 @@ do CHECK_FILTER="git diff --name-only --diff-filter=ACMR $range" # 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 - # Keep these lists consistent: - # - OWNED_TOR_C_FILES in Makefile.am - # - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook - # - try_parse in check_cocci_parse.sh - CHECK_FILES="$($CHECK_FILTER \ + # This is the layout in 0.3.5 + # Keep these lists consistent: + # - OWNED_TOR_C_FILES in Makefile.am + # - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook + # - try_parse in check_cocci_parse.sh + CHECK_FILES="$($CHECK_FILTER \ src/lib/*/*.[ch] \ src/core/*/*.[ch] \ src/feature/*/*.[ch] \ @@ -77,17 +76,7 @@ do src/test/*.[ch] \ src/test/*/*.[ch] \ src/tools/*.[ch] \ - )" - elif [ -d src/common ]; then - # This was the layout before 0.3.5 - CHECK_FILES="$($CHECK_FILTER \ - src/common/*/*.[ch] \ - src/or/*/*.[ch] \ - src/test/*.[ch] \ - src/test/*/*.[ch] \ - src/tools/*.[ch] \ - )" - fi + )" # We want word splitting here, because file names are space # separated |