ls: remove redundant logic
find_unique_abbrev() already returns the full SHA-1 if abbrev = 0, so we can remove the logic that avoids the call. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund committed
Mar 20, 2010 at 19:55 UTC
531e758d9c861facd4ebcc8c9b0e4e1443b5665a
2 files changed
+4
-9
builtin/ls-files.c
+2
-5
@@ -153,8 +153,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
153
printf("%s%06o %s %d\t",
154
tag,
155
ce->ce_mode,
156
- abbrev ? find_unique_abbrev(ce->sha1,abbrev)
157
- : sha1_to_hex(ce->sha1),
156
+ find_unique_abbrev(ce->sha1,abbrev),
157
ce_stage(ce));
158
}
159
write_name_quoted(ce->name + offset, stdout, line_terminator);
@@ -176,9 +175,7 @@ static int show_one_ru(struct string_list_item *item, void *cbdata)
175
if (!ui->mode[i])
176
continue;
177
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
179
- abbrev
180
- ? find_unique_abbrev(ui->sha1[i], abbrev)
181
- : sha1_to_hex(ui->sha1[i]),
178
+ find_unique_abbrev(ui->sha1[i], abbrev),
179
i + 1);
180
write_name_quoted(path + offset, stdout, line_terminator);
181
}
builtin/ls-tree.c
+2
-4
@@ -103,13 +103,11 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
103
} else
104
strcpy(size_text, "-");
105
printf("%06o %s %s %7s\t", mode, type,
106
- abbrev ? find_unique_abbrev(sha1, abbrev)
107
- : sha1_to_hex(sha1),
106
+ find_unique_abbrev(sha1, abbrev),
107
size_text);
108
} else
109
printf("%06o %s %s\t", mode, type,
111
- abbrev ? find_unique_abbrev(sha1, abbrev)
112
- : sha1_to_hex(sha1));
110
+ find_unique_abbrev(sha1, abbrev));
111
}
112
write_name_quotedpfx(base + chomp_prefix, baselen - chomp_prefix,
113
pathname, stdout, line_termination);