commit 7b5f31f2d6bea00d6e67d0f387dbc79398192c66 Author: rl1987 <rl1987@sdf.lonestar.org> Date: Wed Mar 6 19:42:29 2019 +0200 Mention what file has changed --- scripts/maint/post-merge.git-hook | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/maint/post-merge.git-hook b/scripts/maint/post-merge.git-hook index 5c3efe8ba..300684a9b 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"