diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:31 +0900 |
| commit | 0cd58d8ba9aa562dd3c039af9565f61a14da03b8 (patch) | |
| tree | ceae968fea74c4bc814d4fb4242ce88c369195ce /builtin | |
| parent | Merge branch 'js/ident-date-fix' (diff) | |
| parent | submodule--helper: don't print null in 'submodule status' (diff) | |
| download | tgif-0cd58d8ba9aa562dd3c039af9565f61a14da03b8.tar.xz | |
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'
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/submodule--helper.c | 8 |
1 files changed, 6 insertions, 2 deletions
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"); } |