druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta:hooks:pre-push: Extend pattern for autosquash

Browse Source 
Extend the grep pattern for commits starting with `{squash,fixup}!`.
This commit is contained in:
Julian Prein
2022-07-12 20:34:23 +02:00
parent f4fe825ce7
commit ee6153734a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
meta/git/hooks/pre-push
View File

@@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# An example hook script to verify what is about to be pushed. Called by "git # A hook script to verify what is about to be pushed. Called by "git push"
# push" after it has checked the remote status, but before anything has been # after it has checked the remote status, but before anything has been pushed.
# pushed. If this script exits with a non-zero status nothing will be pushed. # If this script exits with a non-zero status nothing will be pushed.
# #
# This hook is called with the following parameters: # This hook is called with the following parameters:
# #
@@ -16,8 +16,10 @@
# #
# <local ref> <local oid> <remote ref> <remote oid> # <local ref> <local oid> <remote ref> <remote oid>
# #
# This sample shows how to prevent push of commits where the log message starts # To enable this hook, save or link this file at `.git/hooks/pre-push`.
# with "WIP" (work in progress). #
# This prevents pushing of commits where the log message starts with "WIP" (work
# in progress) or "{fixup,squash}!" (Autosquash, see git-rebase(1)).
remote="$1" remote="$1"
url="$2" url="$2"
@@ -40,11 +42,14 @@ do
range="$remote_oid..$local_oid" range="$remote_oid..$local_oid"
fi fi
# Check for WIP commit # Check for WIP or auto{squash,fixup} commit
commit=$(git rev-list -n 1 --grep '^WIP' "$range") pattern='^(WIP|(fixup|squash)!)'
if test -n "$commit"
commits="$(git rev-list -E --oneline --grep "$pattern" "$range")"
if test -n "$commits"
then then
echo >&2 "Found WIP commit in $local_ref, not pushing" printf >&2 "$local_ref: Commits in progress:\n%s" "$commits"
printf >&2 "Aborting push"
exit 1 exit 1
fi fi
fi fi