X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fls-files.c;h=c0fbcdcf4f3447c29c4058907ea2e25fa6d225a6;hb=78f17935a306dfd7a1f32c923e0b05a094bf0c25;hp=b065061392718e4250d2c52dc3d53a0c1c7938e9;hpb=797d44343c831680aeae3392259fcadeb178bf61;p=git.git diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b06506139..c0fbcdcf4 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); }