cab851c2f8
'--object-only' is an alias for '--format=%(objectname)'. It cannot
be used together other format-altering options like '--name-only',
'--long' or '--format', they are mutually exclusive.
The "--name-only" option outputs <filepath> only. Likewise, <objectName>
is another high frequency used field, so implement '--object-only' option
will bring intuitive and clear semantics for this scenario. Using
'--format=%(objectname)' we can achieve a similar effect, but the former
is with a lower learning cost(without knowing the format requirement
of '--format' option).
Even so, if a user is prefer to use "--format=%(objectname)", this is entirely
welcome because they are not only equivalent in function, but also have almost
identical performance. The reason is this commit also add the specific of
"--format=%(objectname)" to the current fast-pathes (builtin formats) to
avoid running unnecessary parsing mechanisms.
The following performance benchmarks are based on torvalds/linux.git:
When hit the fast-path:
Benchmark 1: /opt/git/ls-tree-oid-only/bin/git ls-tree -r --object-only HEAD
Time (mean ± σ): 83.6 ms ± 2.0 ms [User: 59.4 ms, System: 24.1 ms]
Range (min … max): 80.4 ms … 87.2 ms 35 runs
Benchmark 1: /opt/git/ls-tree-oid-only/bin/git ls-tree -r --format='%(objectname)' HEAD
Time (mean ± σ): 84.1 ms ± 1.8 ms [User: 61.7 ms, System: 22.3 ms]
Range (min … max): 80.9 ms … 87.5 ms 35 runs
But for a customized format, it will be slower:
Benchmark 1: /opt/git/ls-tree-oid-only/bin/git ls-tree -r --format='oid: %(objectname)' HEAD
Time (mean ± σ): 96.5 ms ± 2.5 ms [User: 72.9 ms, System: 23.5 ms]
Range (min … max): 93.1 ms … 104.1 ms 31 runs
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
77 lines
1.7 KiB
Bash
Executable File
77 lines
1.7 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_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 \
|
|
"%(objectname)" \
|
|
"--object-only"
|
|
|
|
test_ls_tree_format \
|
|
"%(objectname)" \
|
|
"--object-only --abbrev" \
|
|
"--abbrev"
|
|
|
|
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
|