From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:04:53 +0000 (+0900)
Subject: Merge branch 'ao/check-resolve-ref-unsafe-result' into maint
X-Git-Tag: v2.15.1~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9749b0b785c2ccf245835d9a8426fa28c62005e;p=thirdparty%2Fgit.git

Merge branch 'ao/check-resolve-ref-unsafe-result' into maint

"git commit", after making a commit, did not check for errors when
asking on what branch it made the commit, which has been correted.

* ao/check-resolve-ref-unsafe-result:
  commit: check result of resolve_ref_unsafe
---

a9749b0b785c2ccf245835d9a8426fa28c62005e
diff --cc builtin/commit.c
index d75b3805ea,b528290902..b2a6c7f100
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -1491,7 -1482,9 +1491,9 @@@ static void print_summary(const char *p
  	rev.diffopt.break_opt = 0;
  	diff_setup_done(&rev.diffopt);
  
 -	head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL);
 +	head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
+ 	if (!head)
+ 		die_errno(_("unable to resolve HEAD after creating commit"));
  	if (!strcmp(head, "HEAD"))
  		head = _("detached HEAD");
  	else