ref: facb0e757ac63f763bd942a2714f979538b99eb0
parent: c947bf80874168f8bd3786c0ccb473cd5e6adbcb
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Dec 21 19:48:09 EST 2021
git: revert c947bf808 -- it triggers a bug. We seem to have a botch in the protocol negotiation, where we leak some protocol packets into the packfile; this will need to be fixed before we put this change in.
--- a/sys/src/cmd/git/fetch.c
+++ b/sys/src/cmd/git/fetch.c
@@ -260,7 +260,7 @@
if(writepkt(c, buf, n) == -1)
sysfatal("write: %r");
if(!req)
- goto showrefs;
+ return 0;
if(readphase(c) == -1)
sysfatal("read: %r");
if((n = readpkt(c, buf, sizeof(buf))) == -1)
--- a/sys/src/cmd/git/pull
+++ b/sys/src/cmd/git/pull
@@ -7,10 +7,13 @@
upstream=$2
url=$3
dir=$4
+ bflag=()
dflag=()
+ if(! ~ $#branch 0)
+ bflag=(-b $branch)
if(! ~ $#debug 0)
dflag='-d'
- {git/fetch $dflag -u $upstream $url >[2=3] || die $status} | awk '
+ {git/fetch $dflag $bflag -u $upstream $url >[2=3] || die $status} | awk '
/^remote/{
if($2=="HEAD")
next