16fb5c54bd
expand_show_tree() borrows the base strbuf given to us by read_tree() to build the full path of the current entry when handling %(path). Only its indirect caller, show_tree_fmt(), removes the added entry name. That works fine as long as %(path) is only included once in the format string, but accumulates duplicates if it's repeated: $ git ls-tree --format='%(path) %(path) %(path)' HEAD M* Makefile MakefileMakefile MakefileMakefileMakefile Reset the length after each use to get the same expansion every time; here's the behavior with this patch: $ ./git ls-tree --format='%(path) %(path) %(path)' HEAD M* Makefile Makefile Makefile Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
1.8 KiB
Bash
Executable File
74 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='ls-tree --format'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'ls-tree --format usage' '
|
|
test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
|
|
test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
|
|
test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
|
|
'
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir dir &&
|
|
test_commit dir/sub-file &&
|
|
test_commit top-file
|
|
'
|
|
|
|
test_ls_tree_format () {
|
|
format=$1 &&
|
|
opts=$2 &&
|
|
fmtopts=$3 &&
|
|
shift 2 &&
|
|
|
|
test_expect_success "ls-tree '--format=<$format>' is like options '$opts $fmtopts'" '
|
|
git ls-tree $opts -r HEAD >expect &&
|
|
git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "ls-tree '--format=<$format>' on optimized v.s. non-optimized path" '
|
|
git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
|
|
git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
|
|
sed "s/^> //" >actual <actual.raw &&
|
|
test_cmp expect actual
|
|
'
|
|
}
|
|
|
|
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)" \
|
|
""
|
|
|
|
test_ls_tree_format \
|
|
"%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)" \
|
|
"--long"
|
|
|
|
test_ls_tree_format \
|
|
"%(path)" \
|
|
"--name-only"
|
|
|
|
test_ls_tree_format \
|
|
"%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
|
|
"-t" \
|
|
"-t"
|
|
|
|
test_ls_tree_format \
|
|
"%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
|
|
"--full-name" \
|
|
"--full-name"
|
|
|
|
test_ls_tree_format \
|
|
"%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
|
|
"--full-tree" \
|
|
"--full-tree"
|
|
|
|
test_done
|