shithub: git9

Info  •  Files  •  Log  •  Branches

Ancestor only makes sense for non-nil objects.

--- a/ref.c

+++ b/ref.c

@@ -138,6 +138,8 @@

 	if(a == b)

 		return a;

+	if(a == nil || b == nil)

+		return nil;

 	r = nil;

 	memset(ht, 0, sizeof(ht));

 	q1 = nil;

--- a/send.c

+++ b/send.c

@@ -356,7 +356,7 @@

 		 * If we're rolling back with a force push, the other side already

 		 * has our changes. There's no need to send a pack if that's the case.

 		 */

-		if(ancestor(b, a) != b)

+		if(a == nil || b == nil || ancestor(b, a) != b)

 			send = 1;

 	}

 	flushpkt(fd);