diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-04-06 15:21:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-06 15:21:59 -0700 |
| commit | 07330a41d66a2c9589b585a3a24ecdcf19994f19 (patch) | |
| tree | 4d4b77e4bf27705acd4ab51569a253020a1f5299 /builtin/ls-tree.c | |
| parent | Merge branch 'bc/csprng-mktemps' (diff) | |
| parent | ls-tree: `-l` should not imply recursive listing (diff) | |
| download | tgif-07330a41d66a2c9589b585a3a24ecdcf19994f19.tar.xz | |
Merge branch 'tl/ls-tree-oid-only'
"git ls-tree" learns "--oid-only" option, similar to "--name-only",
and more generalized "--format" option.
source: <cover.1648026472.git.dyroneteng@gmail.com>
* tl/ls-tree-oid-only:
ls-tree: `-l` should not imply recursive listing
Diffstat (limited to 'builtin/ls-tree.c')
| -rw-r--r-- | builtin/ls-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 5dac9ee5b9..e279be8bb6 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -255,7 +255,7 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base, printf("%06o %s %s %7s\t", data.mode, type_name(data.type), find_unique_abbrev(data.oid, abbrev), size_text); show_tree_common_default_long(base, pathname, data.base->len); - return 1; + return recurse; } static int show_tree_name_only(const struct object_id *oid, struct strbuf *base, |