commit b3b737b8750b2063c5be260287088defbfadd1b9 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 21 13:35:33 2019 -0500
Update pre-commit.git-hook for ticket 29553
- handle older source layout - handle empty changes directories - "set -e" so that we exit if there's a problem. --- changes/ticket29553 | 5 +++++ scripts/maint/pre-commit.git-hook | 33 ++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/changes/ticket29553 b/changes/ticket29553 new file mode 100644 index 000000000..af441b92b --- /dev/null +++ b/changes/ticket29553 @@ -0,0 +1,5 @@ + o Minor bugfixes (developer tools): + - Update our pre-commit.git-hook script to work correctly on older Tor + branches and release branches without any changes files, + and to actually exit when something fails. Fixes bug 29553; bugfix on + 0.4.0.2-alpha. diff --git a/scripts/maint/pre-commit.git-hook b/scripts/maint/pre-commit.git-hook index b4c4ce206..65fa99f4c 100755 --- a/scripts/maint/pre-commit.git-hook +++ b/scripts/maint/pre-commit.git-hook @@ -10,16 +10,31 @@ workdir=$(git rev-parse --show-toplevel)
cd "$workdir" || exit 1
-python scripts/maint/lintChanges.py ./changes/* +set -e
-perl scripts/maint/checkSpace.pl -C \ -src/lib/*/*.[ch] \ -src/core/*/*.[ch] \ -src/feature/*/*.[ch] \ -src/app/*/*.[ch] \ -src/test/*.[ch] \ -src/test/*/*.[ch] \ -src/tools/*.[ch] +if [ ! -z "ls ./changes/*" ]; then + python scripts/maint/lintChanges.py ./changes/* +fi + +if [ -d src/lib ]; then + # This is the layout in 0.3.5 + perl scripts/maint/checkSpace.pl -C \ + src/lib/*/*.[ch] \ + src/core/*/*.[ch] \ + src/feature/*/*.[ch] \ + src/app/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] +elif [ -d src/common]; then + # This was the layout before 0.3.5 + perl scripts/maint/checkSpace.pl -C \ + src/common/*/*.[ch] \ + src/or/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] +fi
if test -e scripts/maint/checkIncludes.py; then python scripts/maint/checkIncludes.py