summaryrefslogtreecommitdiff
path: root/builtin/ls-files.c
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@googlemail.com>2010-03-20 18:55:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 23:23:44 (GMT)
commit531e758d9c861facd4ebcc8c9b0e4e1443b5665a (patch)
tree0782bcd9e4d0133d3acec2215942bbc9f31c265b /builtin/ls-files.c
parent28a53178fcd3c9a6576b20040982ca0b9e972f42 (diff)
downloadgit-531e758d9c861facd4ebcc8c9b0e4e1443b5665a.zip
git-531e758d9c861facd4ebcc8c9b0e4e1443b5665a.tar.gz
git-531e758d9c861facd4ebcc8c9b0e4e1443b5665a.tar.bz2
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>
Diffstat (limited to 'builtin/ls-files.c')
-rw-r--r--builtin/ls-files.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index b065061..c0fbcdc 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -153,8 +153,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
printf("%s%06o %s %d\t",
tag,
ce->ce_mode,
- abbrev ? find_unique_abbrev(ce->sha1,abbrev)
- : sha1_to_hex(ce->sha1),
+ find_unique_abbrev(ce->sha1,abbrev),
ce_stage(ce));
}
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)
if (!ui->mode[i])
continue;
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
- abbrev
- ? find_unique_abbrev(ui->sha1[i], abbrev)
- : sha1_to_hex(ui->sha1[i]),
+ find_unique_abbrev(ui->sha1[i], abbrev),
i + 1);
write_name_quoted(path + offset, stdout, line_terminator);
}