mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-tree: simplify nesting if/else logic in "show_tree()"

Browse Source 
Use the object_type() function to determine the object type from the
"mode" passed to us by read_tree(), instead of doing so with the S_*()
macros.

Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Teng Long <dyronetengb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Teng Long
2022-03-23 17:13:07 +08:00
committed by Junio C Hamano
parent 889f78383e
commit 87af0ddf5f
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/ls-tree.c
View File

@ -66,20 +66,17 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
{ {
int recurse = 0; int recurse = 0;
size_t baselen; size_t baselen;
enum object_type type = OBJ_BLOB; enum object_type type = object_type(mode);
if (S_ISGITLINK(mode)) { if (type == OBJ_BLOB) {
type = OBJ_COMMIT; if (ls_options & LS_TREE_ONLY)
} else if (S_ISDIR(mode)) { return 0;
if (show_recursive(base->buf, base->len, pathname)) { } else if (type == OBJ_TREE &&
show_recursive(base->buf, base->len, pathname)) {
recurse = READ_TREE_RECURSIVE; recurse = READ_TREE_RECURSIVE;
if (!(ls_options & LS_SHOW_TREES)) if (!(ls_options & LS_SHOW_TREES))
return recurse; return recurse;
} }
type = OBJ_TREE;
}
else if (ls_options & LS_TREE_ONLY)
return 0;
if (!(ls_options & LS_NAME_ONLY)) { if (!(ls_options & LS_NAME_ONLY)) {
if (ls_options & LS_SHOW_SIZE) { if (ls_options & LS_SHOW_SIZE) {