[tor-commits] [tor/master] Also print changes in git helper scripts, if any

[asn at torproject.org]

commit bb8b2f47d0f63b761bdffeceaec9b5eac1b375f5
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Fri Mar 1 17:54:54 2019 +0200

    Also print changes in git helper scripts, if any
---
 scripts/maint/post-merge.git-hook | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/post-merge.git-hook b/scripts/maint/post-merge.git-hook
index eb98257f0..475a10f59 100755
--- a/scripts/maint/post-merge.git-hook
+++ b/scripts/maint/post-merge.git-hook
@@ -13,12 +13,20 @@ check_for_diffs() {
                         echo "ATTENTION: $1 hook has changed:"
                         echo "==============================="
                         diff "$installed" "$latest"
-                        exit 1
                fi
         fi
 }
 
+check_for_script_update() {
+        fullpath="$git_toplevel/scripts/maint/$1"
+
+        git diff ORIG_HEAD HEAD --exit-code -- "$fullpath"
+}
+
 check_for_diffs "pre-push"
 check_for_diffs "pre-commit"
 check_for_diffs "post-merge"
 
+check_for_script_update "git-merge-forward.sh"
+check_for_script_update "git-pull-all.sh"
+check_for_script_update "git-push-all.sh"