Merge branch 'rs/ls-tree-path-expansion-fix' into maint-2.39

[thirdparty/git.git] / builtin / ls-tree.c

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index c3ea09281afebe0c9aefb690f6f10044142a4d1a..b1f69fbe92d89704a5e7e11f8f560f65ef092216 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -94,16 +94,16 @@ static size_t expand_show_tree(struct strbuf *sb, const char *start,
        } else if (skip_prefix(start, "(objectname)", &p)) {
                strbuf_add_unique_abbrev(sb, data->oid, abbrev);
        } else if (skip_prefix(start, "(path)", &p)) {
-               const char *name = data->base->buf;
+               const char *name;
                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, &quoted, NULL, 0);
-               strbuf_addbuf(sb, &quoted);
+               quote_c_style(name, sb, NULL, 0);
+               strbuf_setlen(data->base, baselen);
                strbuf_release(&sbuf);
-               strbuf_release(&quoted);
        } else {
                errlen = (unsigned long)len;
                die(_("bad ls-tree format: %%%.*s"), errlen, start);
@@ -144,7 +144,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 UNUSED)
 {
-       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 && (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;
 }