ref: 60ea3e6d25c6ec6e1ed659b2e9ba49b91c911424
parent: 83fe095033418ea6b95204c41e22d96ec133243f
author: Ori Bernstein <ori@eigenstate.org>
date: Sat Dec 21 17:40:27 EST 2024
git/pull: only show commit summary after updating branches this makes human error somewhat harder in noscroll windows.
--- a/sys/src/cmd/git/pull
+++ b/sys/src/cmd/git/pull
@@ -63,10 +63,15 @@
}
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
# no local commits that need merging.
if(~ $#quiet 0)
- git/log -s -e $local'..'$remote
-echo $remote':' `{git/query $local} '=>' `{git/query $remote}-git/branch -mnb $remote $local
+ git/log -s -e $oldcommit'..'$newcommit
+
exit ''
--
⑨