xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

git: revert c947bf808 -- it triggers a bug.

Browse source 
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.
This commit is contained in:
Ori Bernstein 2021-12-22 00:48:09 +00:00
parent c947bf8087
commit facb0e757a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/git/fetch.c
View file

@ -260,7 +260,7 @@ fetchpack(Conn *c)
if(writepkt(c, buf, n) == -1) if(writepkt(c, buf, n) == -1)
sysfatal("write: %r"); sysfatal("write: %r");
if(!req) if(!req)
goto showrefs; return 0;
if(readphase(c) == -1) if(readphase(c) == -1)
sysfatal("read: %r"); sysfatal("read: %r");
if((n = readpkt(c, buf, sizeof(buf))) == -1) if((n = readpkt(c, buf, sizeof(buf))) == -1)

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

@ -7,10 +7,13 @@ fn update{
upstream=$2 upstream=$2
url=$3 url=$3
dir=$4 dir=$4
bflag=()
dflag=() dflag=()
if(! ~ $#branch 0)
bflag=(-b $branch)
if(! ~ $#debug 0) if(! ~ $#debug 0)
dflag='-d' 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/{ /^remote/{
if($2=="HEAD") if($2=="HEAD")
next next