procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix logic of Git pre-push hook when pushing a new branch

Browse source 
* build-aux/git-hooks/pre-push: Update the Git command to run on each
iteration.
This commit is contained in:
Jim Porter 2023-04-23 12:04:34 -07:00
parent 9914de503b
commit e26dcc0e14
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build-aux/git-hooks/pre-push
View file

@ -49,19 +49,19 @@ $awk -v origin_name="$1" '
$2 ~ /^[a-z0-9]{40}$/ {
newref = $2
# If the remote SHA is all zeroes, this is a new object to be
# pushed (likely a branch). Go backwards until we find a SHA on
# an origin branch.
# pushed (likely a branch)...
if ($4 ~ /^0{40}$/) {
back = 0
cmd = ("git branch -r -l '\''" origin_name "/*'\'' --contains " \
newref "~" back)
while ((cmd | getline) == 0) {
# Only look back at most 1000 commits, just in case...
if (back++ > 1000)
# ... Go backwards until we find a SHA on an origin branch.
# Stop trying after 1000 commits, just in case...
for (back = 0; back < 1000; back++) {
cmd = ("git branch -r -l '\''" origin_name "/*'\''" \
" --contains " newref "~" back)
rv = (cmd | getline)
close(cmd)
if (rv > 0)
break;
}
close(cmd)
cmd = ("git rev-parse " newref "~" back)
cmd | getline oldref