Bläddra i källkod

Also print changes in git helper scripts, if any

rl1987 5 år sedan
förälder
incheckning
bb8b2f47d0
1 ändrade filer med 9 tillägg och 1 borttagningar
  1. 9 1
      scripts/maint/post-merge.git-hook

+ 9 - 1
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"