mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-29 21:22:23 +02:00
Code

Merge branch 'nd/submodule-status-fix'

Browse Source 
"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'
This commit is contained in:
Junio C Hamano 2018-05-08 15:59:31 +09:00
commit 0cd58d8ba9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/submodule--helper.c
View File

@ -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");
}