diff options
| -rw-r--r-- | builtin/ls-tree.c | 6 | ||||
| -rwxr-xr-x | t/t3104-ls-tree-format.sh | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 8a1bf2fa4d..c3284610dd 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -97,9 +97,12 @@ static size_t expand_show_tree(struct strbuf *sb, const char *start, const char *prefix = chomp_prefix ? ls_tree_prefix : NULL; struct strbuf quoted = STRBUF_INIT; struct strbuf sbuf = STRBUF_INIT; + size_t baselen = data->base->len; + strbuf_addstr(data->base, data->pathname); name = relative_path(data->base->buf, prefix, &sbuf); quote_c_style(name, "ed, NULL, 0); + strbuf_setlen(data->base, baselen); strbuf_addbuf(sb, "ed); strbuf_release(&sbuf); strbuf_release("ed); @@ -143,7 +146,6 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, void *context) { - size_t baselen; int recurse = 0; struct strbuf sb = STRBUF_INIT; enum object_type type = object_type(mode); @@ -163,12 +165,10 @@ static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, if (type == OBJ_BLOB && (ls_options & LS_TREE_ONLY)) return 0; - baselen = base->len; strbuf_expand(&sb, format, expand_show_tree, &data); strbuf_addch(&sb, line_termination); fwrite(sb.buf, sb.len, 1, stdout); strbuf_release(&sb); - strbuf_setlen(base, baselen); return recurse; } diff --git a/t/t3104-ls-tree-format.sh b/t/t3104-ls-tree-format.sh index 7f1eb699d3..7e6c4dc5da 100755 --- a/t/t3104-ls-tree-format.sh +++ b/t/t3104-ls-tree-format.sh @@ -37,6 +37,12 @@ test_ls_tree_format () { ' } +test_expect_success "ls-tree --format='%(path) %(path) %(path)' HEAD top-file" ' + git ls-tree --format="%(path) %(path) %(path)" HEAD top-file.t >actual && + echo top-file.t top-file.t top-file.t >expect && + test_cmp expect actual +' + test_ls_tree_format \ "%(objectmode) %(objecttype) %(objectname)%x09%(path)" \ "" |