diff options
| author | rl1987 <rl1987@sdf.lonestar.org> | 2019-03-01 17:54:54 +0200 |
|---|---|---|
| committer | rl1987 <rl1987@sdf.lonestar.org> | 2019-03-10 18:28:06 +0200 |
| commit | bb8b2f47d0f63b761bdffeceaec9b5eac1b375f5 (patch) | |
| tree | 620c1486ece6f057f91c81f95f775601481a1c64 /scripts/maint | |
| parent | 2d3ef34dcebf360a98d875639484c8e92274b19b (diff) | |
| download | tor-bb8b2f47d0f63b761bdffeceaec9b5eac1b375f5.tar.gz tor-bb8b2f47d0f63b761bdffeceaec9b5eac1b375f5.zip | |
Also print changes in git helper scripts, if any
Diffstat (limited to 'scripts/maint')
| -rwxr-xr-x | scripts/maint/post-merge.git-hook | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/maint/post-merge.git-hook b/scripts/maint/post-merge.git-hook index eb98257f0b..475a10f590 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" |