From: Fraser Tweedale <frase@frase.id.au>
Date: Thu, 31 Jan 2013 12:22:51 +0000 (+1000)
Subject: push: fix segfault when HEAD points nowhere
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d2c14df1605a05118524b2382402d689f69d737;p=git.git

push: fix segfault when HEAD points nowhere

After a push of a branch other than the current branch fails in
a no-ff error and if you are still on an unborn branch, the code
recently added to report the failure dereferenced a null pointer
while checking the name of the current branch.

Signed-off-by: Fraser Tweedale <frase@frase.id.au>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/transport.c b/transport.c
index 7864007c9..af442af32 100644
--- a/transport.c
+++ b/transport.c
@@ -744,7 +744,7 @@ void transport_print_push_status(const char *dest, struct ref *refs,
 			n += print_one_push_status(ref, dest, n, porcelain);
 		if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD &&
 		    *nonfastforward != NON_FF_HEAD) {
-			if (!strcmp(head, ref->name))
+			if (head != NULL && !strcmp(head, ref->name))
 				*nonfastforward = NON_FF_HEAD;
 			else
 				*nonfastforward = NON_FF_OTHER;