melch/git-hooks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent-foxtrot: format file

Browse Source
This commit is contained in:
Alfred Melch 2021-08-26 12:30:24 +02:00
parent ec59721459
commit cde7d73594
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pre-receive.d/prevent-foxtrot-merge.sh
View File

@ -29,16 +29,15 @@ do
# Should appear once as a parent # Should appear once as a parent
# awk: print the second word # awk: print the second word
# The second word is the first parent. Third word would be second parent, ... # The second word is the first parent. Third word would be second parent, ...
MATCH=`git log --first-parent --pretty='%H %P' $oldrev..$newrev | MATCH=`git log --first-parent --pretty='%H %P' $oldrev..$newrev | grep $oldrev | awk '{ print $2 }'`
grep $oldrev |
awk '{ print $2 }'` # First parent should be the oldrev
# First parent should be the oldrev if [ "$oldrev" = "$MATCH" ]; then
if [ "$oldrev" = "$MATCH" ]; then exit 0
exit 0 else
else echo >&2 "*** Push rejected! Foxtrot merge blocked! ***"
echo >&2 "*** Push rejected! Foxtrot merge blocked! ***" echo "See: https://blog.developer.atlassian.com/stop-foxtrots-now/"
echo "See: https://blog.developer.atlassian.com/stop-foxtrots-now/" exit 1
exit 1 fi
fi
fi fi
done done