Created
September 28, 2020 15:07
-
-
Save flniu/d64edfdca7321b1d4a15e5ee49bc6fb6 to your computer and use it in GitHub Desktop.
Git server-side hook to prevent merge remote-tracking branch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
refname="$1" | |
oldrev="$2" | |
newrev="$3" | |
if [ -z "$GIT_DIR" ]; then | |
echo "Don't run this script from the command line." >&2 | |
echo " (if you want, you could supply GIT_DIR then run" >&2 | |
echo " $0 <ref> <oldrev> <newrev>)" >&2 | |
exit 1 | |
fi | |
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then | |
echo "usage: $0 <ref> <oldrev> <newrev>" >&2 | |
exit 1 | |
fi | |
#echo DEBUG "$refname" "$oldrev" "$newrev" | |
for rev in `git rev-list "$oldrev".."$newrev"`; do | |
message=`git cat-file commit "$rev" | sed '1,/^$/d'` | |
if echo "$message" | grep -q "^Merge branch .* of .*"; then | |
echo COMMIT: "$rev" | |
echo MESSAGE: "$message" | |
echo "POLICY: You may use git pull, use git pull --rebase instead." | |
exit 1 | |
fi | |
if echo "$message" | grep -q "^Merge remote-tracking branch"; then | |
echo COMMIT: "$rev" | |
echo MESSAGE: "$message" | |
echo "POLICY: You may merge upstream branch, use rebase instead." | |
exit 1 | |
fi | |
done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment