From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Nov 2017 04:11:25 +0000 (+0900)
Subject: Merge branch 'ao/check-resolve-ref-unsafe-result'
X-Git-Tag: v2.16.0-rc0~177
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4a1638cbd5ab1037cbf5cde652de0b041e952d55?hp=--cc

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

"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
---

4a1638cbd5ab1037cbf5cde652de0b041e952d55
diff --cc builtin/commit.c
index af034553fc,b528290902..1a4ad725bc
--- 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