diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-04-18 16:53:37 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-04-19 06:24:23 +0900 |
| commit | 0b5e2ea7cf3b0fd0f4339b7c8b69cb8c5853c0cd (patch) | |
| tree | f390f4469b708903d71b5fbea068aaf256f3ea9d | |
| parent | submodule: port submodule subcommand 'status' from shell to C (diff) | |
| download | tgif-0b5e2ea7cf3b0fd0f4339b7c8b69cb8c5853c0cd.tar.xz | |
submodule--helper: don't print null in 'submodule status'
The function compute_rev_name() can return NULL sometimes (e.g. right
after 'submodule init'). The current code makes 'submodule status'
print this:
19d97bf5af05312267c2e874ee6bcf584d9e9681 sha1collisiondetection ((null))
This ugly 'null' adds no value to the user using this command. More
importantly printf() on some platform can't handle NULL as a string
and will crash instead of printing '(null)'.
Check for this and skip printing this part (the alternative is
printing '(n/a)' or something but I think that is just noise).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 a4193c01d9..d85b29b49e 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -562,8 +562,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"); } |