shithub: git9

Info  •  Files  •  Log  •  Branches

don't bail if we're force pushing and we don't have their object

when force pushing, we're trying to overwrite their diverged branch,
so we may not actually have the object that they have as root; this
isn't an error, so we can just skip it.

--- a/send.c

+++ b/send.c

@@ -177,8 +177,12 @@

 	e = nil;

 	for(i = 0; i < nupd; i++){

 		u = &upd[i];

-		if((o = readobject(u->ours)) == nil)

-			sysfatal("could not read object %H", u->ours);

+		if((o = readobject(u->ours)) == nil){

+			if(force)

+				continue;

+			else

+				sysfatal("could not read object %H", u->ours);

+		}

 		n = emalloc(sizeof(Objq));

 		n->obj = o;