From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:31 +0000 (+0900)
Subject: Merge branch 'nd/submodule-status-fix'
X-Git-Tag: v2.18.0-rc0~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0cd58d8ba9aa562dd3c039af9565f61a14da03b8?hp=0657e0f802b0e0a97738c074dd27ee47eeb3366f

Merge branch 'nd/submodule-status-fix'

"git submodule status" did not check the symbolic revision name it
computed for the submodule HEAD is not the NULL, and threw it at
printf routines, which has been corrected.

* nd/submodule-status-fix:
submodule--helper: don't print null in 'submodule status'
---

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 7586f776fe..c2403a915f 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -596,8 +596,12 @@ static void print_status(unsigned int flags, char state, const char *path,
 
 	printf("%c%s %s", state, oid_to_hex(oid), displaypath);
 
-	if (state == ' ' || state == '+')
-		printf(" (%s)", compute_rev_name(path, oid_to_hex(oid)));
+	if (state == ' ' || state == '+') {
+		const char *name = compute_rev_name(path, oid_to_hex(oid));
+
+		if (name)
+			printf(" (%s)", name);
+	}
 
 	printf("\n");
 }