diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-01-23 13:39:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-23 13:39:50 -0800 |
commit | 8a40af9cabe2efbb830bf90c864ffda3136926ba (patch) | |
tree | 39d9cadffe0693da25fa5d77afdeeb506d1b23c7 | |
parent | b26956351209415520487c036541d58c2fd7ef2d (diff) | |
parent | c388fcda9943c0cf46960787041a1ff3bcf5e833 (diff) | |
download | git-8a40af9cabe2efbb830bf90c864ffda3136926ba.tar.gz |
Merge branch 'rs/ls-tree-path-expansion-fix'
"git ls-tree --format='%(path) %(path)' $tree $path" showed the
path three times, which has been corrected.
* rs/ls-tree-path-expansion-fix:
ls-tree: remove dead store and strbuf for quote_c_style()
ls-tree: fix expansion of repeated %(path)
-rw-r--r-- | builtin/ls-tree.c | 11 | ||||
-rwxr-xr-x | t/t3104-ls-tree-format.sh | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 72eb70823d..8cc8c995df 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -94,14 +94,14 @@ static size_t expand_show_tree(struct strbuf *sb, const char *start, } else if (skip_prefix(start, "(path)", &p)) { const char *name = data->base->buf; const char *prefix = options->chomp_prefix ? options->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_addbuf(sb, "ed); + quote_c_style(name, sb, NULL, 0); + strbuf_setlen(data->base, baselen); strbuf_release(&sbuf); - strbuf_release("ed); } else { errlen = (unsigned long)len; die(_("bad ls-tree format: %%%.*s"), errlen, start); @@ -144,7 +144,6 @@ static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, void *context) { struct ls_tree_options *options = context; - size_t baselen; int recurse = 0; struct strbuf sb = STRBUF_INIT; enum object_type type = object_type(mode); @@ -164,12 +163,10 @@ static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, if (type == OBJ_BLOB && (options->ls_options & LS_TREE_ONLY)) return 0; - baselen = base->len; strbuf_expand(&sb, options->format, expand_show_tree, &cb_data); strbuf_addch(&sb, options->null_termination ? '\0' : '\n'); 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 74053978f4..3adb206a93 100755 --- a/t/t3104-ls-tree-format.sh +++ b/t/t3104-ls-tree-format.sh @@ -35,6 +35,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)" \ "" |