diff options
| author | rl1987 <rl1987@sdf.lonestar.org> | 2019-03-06 19:42:29 +0200 |
|---|---|---|
| committer | rl1987 <rl1987@sdf.lonestar.org> | 2019-03-10 18:28:06 +0200 |
| commit | 7b5f31f2d6bea00d6e67d0f387dbc79398192c66 (patch) | |
| tree | 95ae02bb1bc1092be135c11b3c19478cfe5e2d04 /scripts | |
| parent | 73fed3ee1c93b9a49ce474fdaac74fd10ec4bd55 (diff) | |
| download | tor-7b5f31f2d6bea00d6e67d0f387dbc79398192c66.tar.gz tor-7b5f31f2d6bea00d6e67d0f387dbc79398192c66.zip | |
Mention what file has changed
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/maint/post-merge.git-hook | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/maint/post-merge.git-hook b/scripts/maint/post-merge.git-hook index 5c3efe8ba3..300684a9b6 100755 --- a/scripts/maint/post-merge.git-hook +++ b/scripts/maint/post-merge.git-hook @@ -28,7 +28,11 @@ check_for_diffs() { check_for_script_update() { fullpath="$git_toplevel/scripts/maint/$1" - git diff ORIG_HEAD HEAD --exit-code -- "$fullpath" + if ! git diff ORIG_HEAD HEAD --exit-code -- "$fullpath" >/dev/null + then + echo "ATTENTION: $1 has changed:" + git diff ORIG_HEAD HEAD -- "$fullpath" + fi } check_for_diffs "pre-push" |