Re: [PATCH] Produce a nicer output in case of sha1_object_info failures in ls-tree -l
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:25
Alex Riesen [off-list ref] writes:
How about this patch instead? I chose "BAD" for the marker, as any automatic processing trying blindly to convert it into a number will get a 0, which seems safe to me.
Such a broken automatic processing won't mind getting any garbage; the choice among this patch, your original "say 0 when we do not know" patch, or unpatched "size is undefined when an entry is corrupt" git wouldn't make a whit of difference to it. An automatic processing that does validate its input will notice BAD is not a number, and can handle such a corrupt entry more sanely, which is potentially a big plus. I think this round is a big improvement.
quoted hunk
builtin-ls-tree.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-)diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c index fca4631..22008df 100644 --- a/builtin-ls-tree.c +++ b/builtin-ls-tree.c@@ -60,7 +60,6 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen, { int retval = 0; const char *type = blob_type; - unsigned long size; if (S_ISGITLINK(mode)) { /*@@ -90,17 +89,20 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen, if (!(ls_options & LS_NAME_ONLY)) { if (ls_options & LS_SHOW_SIZE) { + char size_text[24]; if (!strcmp(type, blob_type)) { - sha1_object_info(sha1, &size); - printf("%06o %s %s %7lu\t", mode, type, - abbrev ? find_unique_abbrev(sha1, abbrev) - : sha1_to_hex(sha1), - size); + unsigned long size; + if (sha1_object_info(sha1, &size) == OBJ_BAD) + strcpy(size_text, "BAD"); + else + snprintf(size_text, sizeof(size_text), + "%lu", size); } else - printf("%06o %s %s %7c\t", mode, type, - abbrev ? find_unique_abbrev(sha1, abbrev) - : sha1_to_hex(sha1), - '-'); + strcpy(size_text, "-"); + printf("%06o %s %s %7s\t", mode, type, + abbrev ? find_unique_abbrev(sha1, abbrev) + : sha1_to_hex(sha1), + size_text); } else printf("%06o %s %s\t", mode, type, abbrev ? find_unique_abbrev(sha1, abbrev)-- 1.6.2.1.237.g7206c6