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>
Nguyễn Thái Ngọc Duy committed
Apr 18, 2018 at 16:53 UTC
0b5e2ea7cf3b0fd0f4339b7c8b69cb8c5853c0cd
1 file changed
+6
-2
builtin/submodule--helper.c
+6
-2
@@ -562,8 +562,12 @@ static void print_status(unsigned int flags, char state, const char *path,
562
563
printf("%c%s %s", state, oid_to_hex(oid), displaypath);
564
565
- if (state == ' ' || state == '+')
566
- printf(" (%s)", compute_rev_name(path, oid_to_hex(oid)));
565
+ if (state == ' ' || state == '+') {
566
+ const char *name = compute_rev_name(path, oid_to_hex(oid));
567
+
568
+ if (name)
569
+ printf(" (%s)", name);
570
+ }
571
572
printf("\n");
573
}