From 0375d0a3ab85db3325a2ca8975606aab782504a1 Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Sun, 17 Apr 2022 01:19:10 +0000 Subject: [PATCH] git/send: fill in 'theirs' object, even if we miss it When pushing, git/send would sometimes decide we had all the objects that we'd need to update the remote, and would try to pack and send the entire history of the repository. This is because we only set the 'theirs' ref when we had the object. If we didn't have the object, we would set a zero hash, then when deciding if we needed to force, we would think that we were updating a new branch and send everything, which would fail to update the remote. --- sys/src/cmd/git/send.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/src/cmd/git/send.c b/sys/src/cmd/git/send.c index 877c369e5..1188a71fa 100644 --- a/sys/src/cmd/git/send.c +++ b/sys/src/cmd/git/send.c @@ -134,8 +134,8 @@ sendpack(Conn *c) nmap = nours; map = eamalloc(nmap, sizeof(Map)); for(i = 0; i < nmap; i++){ - map[i].ours = ours[i]; map[i].theirs = Zhash; + map[i].ours = ours[i]; map[i].ref = refs[i]; } while(1){ @@ -155,9 +155,15 @@ sendpack(Conn *c) theirs = earealloc(theirs, ntheirs+1, sizeof(Hash)); if(hparse(&theirs[ntheirs], sp[0]) == -1) sysfatal("invalid hash %s", sp[0]); + if((idx = findkey(map, nmap, sp[1])) != -1) + map[idx].theirs = theirs[ntheirs]; + /* + * we only keep their ref if we can read the object to add it + * to our reachability; otherwise, discard it; we only care + * that we don't have it, so we can tell whether we need to + * bail out of pushing. + */ if((o = readobject(theirs[ntheirs])) != nil){ - if((idx = findkey(map, nmap, sp[1])) != -1) - map[idx].theirs = theirs[ntheirs]; ntheirs++; unref(o); } @@ -180,7 +186,7 @@ sendpack(Conn *c) p = ancestor(a, b); if(!force && !hasheq(&m->theirs, &Zhash) && (a == nil || p != a)){ fprint(2, "remote has diverged\n"); - werrstr("force needed"); + werrstr("remote diverged"); flushpkt(c); return -1; }