mirror of
https://github.com/git/git.git
synced 2024-06-10 14:36:48 +02:00
f4b98e17cf
Builtin "git mktree" writes the the object name of the tree object built to the standard output. Tests 'mktree refuses to read ls-tree -r output (1)' and 'mktree refuses to read ls-tree -r output (2)' in "t1010-mktree.sh" redirect output of "git mktree" to a file, but don't use its contents in assertions. Don't redirect output of "git mktree" to file "actual" in tests that assert that an invocation of "git mktree" must fail. Output of "git mktree" is empty when it refuses to build a tree object. So, alternatively, the test could assert that the output is empty. However, there isn't a good reason for the user to expect the command to be silent in such cases, so we shouldn't enforce it. The user shouldn't use the output of a failing command anyway. Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
1.7 KiB
Bash
Executable File
71 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git mktree'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
for d in a a- a0
|
|
do
|
|
mkdir "$d" && echo "$d/one" >"$d/one" &&
|
|
git add "$d" || return 1
|
|
done &&
|
|
echo zero >one &&
|
|
git update-index --add --info-only one &&
|
|
git write-tree --missing-ok >tree.missing &&
|
|
git ls-tree $(cat tree.missing) >top.missing &&
|
|
git ls-tree -r $(cat tree.missing) >all.missing &&
|
|
echo one >one &&
|
|
git add one &&
|
|
git write-tree >tree &&
|
|
git ls-tree $(cat tree) >top &&
|
|
git ls-tree -r $(cat tree) >all &&
|
|
test_tick &&
|
|
git commit -q -m one &&
|
|
H=$(git rev-parse HEAD) &&
|
|
git update-index --add --cacheinfo 160000 $H sub &&
|
|
test_tick &&
|
|
git commit -q -m two &&
|
|
git rev-parse HEAD^{tree} >tree.withsub &&
|
|
git ls-tree HEAD >top.withsub &&
|
|
git ls-tree -r HEAD >all.withsub
|
|
'
|
|
|
|
test_expect_success 'ls-tree piped to mktree (1)' '
|
|
git mktree <top >actual &&
|
|
test_cmp tree actual
|
|
'
|
|
|
|
test_expect_success 'ls-tree piped to mktree (2)' '
|
|
git mktree <top.withsub >actual &&
|
|
test_cmp tree.withsub actual
|
|
'
|
|
|
|
test_expect_success 'ls-tree output in wrong order given to mktree (1)' '
|
|
perl -e "print reverse <>" <top |
|
|
git mktree >actual &&
|
|
test_cmp tree actual
|
|
'
|
|
|
|
test_expect_success 'ls-tree output in wrong order given to mktree (2)' '
|
|
perl -e "print reverse <>" <top.withsub |
|
|
git mktree >actual &&
|
|
test_cmp tree.withsub actual
|
|
'
|
|
|
|
test_expect_success 'allow missing object with --missing' '
|
|
git mktree --missing <top.missing >actual &&
|
|
test_cmp tree.missing actual
|
|
'
|
|
|
|
test_expect_success 'mktree refuses to read ls-tree -r output (1)' '
|
|
test_must_fail git mktree <all
|
|
'
|
|
|
|
test_expect_success 'mktree refuses to read ls-tree -r output (2)' '
|
|
test_must_fail git mktree <all.withsub
|
|
'
|
|
|
|
test_done
|