~ori/git9: git/send: allow the remote to have refs that we don't

36224fde10f6d42dbd12d1bb8e4010f91f18a1a7 — Ori Bernstein 3 years ago 52bd6a5

git/send: allow the remote to have refs that we don't

It's not fatal for someone else to push a branch
with objects that we don't have. We should deal
with it gracefully, and act as though it doesn't
exist.

patch browse .tar.gz

1 files changed, 7 insertions(+), 4 deletions(-)

M send.c

M send.c => send.c +7 -4

@@ 121,7 121,7 @@ sendpack(Conn *c)
 	int nours, ntheirs, nmap;
 	char buf[Pktmax], *sp[3];
 	Hash h, *theirs, *ours;
-	Object *a, *b, *p;
+	Object *a, *b, *p, *o;
 	char **refs;
 	Capset cs;
 	Map *map, *m;


@@ 155,9 155,12 @@ 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];
-		ntheirs++;
+		if((o = readobject(theirs[ntheirs])) != nil){
+			if((idx = findkey(map, nmap, sp[1])) != -1)
+				map[idx].theirs = theirs[ntheirs];
+			ntheirs++;
+			unref(o);
+		}
 	}
 
 	if(writephase(c) == -1)