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: https://git.lorimer.id.au/gitweb.git/diff_plain/a9749b0b785c2ccf245835d9a8426fa28c62005e?hp=9fbcb51ec548318f0088a5fee6c77a5f1d8512b4

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

diff --git a/builtin/commit.c b/builtin/commit.c
index d75b3805ea..b2a6c7f100 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1492,6 +1492,8 @@ static void print_summary(const char *prefix, const struct object_id *oid,
 	diff_setup_done(&rev.diffopt);
 
 	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