cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git/pull: only show commit summary after updating branches

Browse source 
this makes human error somewhat harder in noscroll windows.
This commit is contained in:
Ori Bernstein 2024-12-21 22:40:27 +00:00
parent 83fe095033
commit 60ea3e6d25
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/src/cmd/git/pull
View file

@ -63,10 +63,15 @@ if(! ~ `{git/query HEAD $remote @} `{git/query HEAD}){
} }
exit diverged exit diverged
} }
oldcommit=`{git/query $local}
newcommit=`{git/query $remote}
echo $remote':' $oldcommit '=>' `$newcommit
git/branch -mnb $remote $local
# The remote is directly ahead of the local, and we have # The remote is directly ahead of the local, and we have
# no local commits that need merging. # no local commits that need merging.
if(~ $#quiet 0) if(~ $#quiet 0)
git/log -s -e $local'..'$remote git/log -s -e $oldcommit'..'$newcommit
echo $remote':' `{git/query $local} '=>' `{git/query $remote}
git/branch -mnb $remote $local
exit '' exit ''