Merge branch 'tor-github/pr/780'

This commit is contained in:
George Kadianakis 2019-03-13 16:07:19 +02:00
commit 26b0d95397
7 changed files with 49 additions and 0 deletions

4
changes/ticket29588 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (developer tools):
- Introduce a post-merge git hook script to check if we're pulling in any
changes to our git workspace management scripts from upstream. Resolves
issue 29588.

45
scripts/git/post-merge.git-hook Executable file
View File

@ -0,0 +1,45 @@
#!/bin/sh
# This is post-merge git hook script to check for changes in:
# * git hook scripts
# * helper scripts for using git efficiently.
# If any changes are detected, a diff of them is printed.
#
# To install this script, copy it to .git/hooks/post-merge in local copy of
# tor git repo and make sure it has permission to execute.
git_toplevel=$(git rev-parse --show-toplevel)
check_for_diffs() {
installed="$git_toplevel/.git/hooks/$1"
latest="$git_toplevel/scripts/git/$1.git-hook"
if [ -e "$installed" ]
then
if ! cmp "$installed" "$latest" >/dev/null 2>&1
then
echo "ATTENTION: $1 hook has changed:"
echo "==============================="
diff -u "$installed" "$latest"
fi
fi
}
check_for_script_update() {
fullpath="$1"
if ! git diff ORIG_HEAD HEAD --exit-code -- "$fullpath" >/dev/null
then
echo "ATTENTION: $1 has changed:"
git --no-pager diff ORIG_HEAD HEAD -- "$fullpath"
fi
}
check_for_diffs "pre-push"
check_for_diffs "pre-commit"
check_for_diffs "post-merge"
for file in "$git_toplevel"/scripts/git/* ; do
check_for_script_update "$file"
done