undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-files tests: add meaningful --with-tree tests

Browse Source 
Add tests for "ls-files --with-tree". There was effectively no
coverage for any normal usage of this command, only the tests added in
54e1abce90 (Add test case for ls-files --with-tree, 2007-10-03) for
an obscure bug.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-03-20 23:37:45 +01:00 committed by Junio C Hamano
parent dcc0a86f2f
commit 8de78218c5
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
t/t3060-ls-files-with-tree.sh
View File

@ -47,6 +47,12 @@ test_expect_success setup '
git add . git add .
' '
test_expect_success 'usage' '
test_expect_code 128 git ls-files --with-tree=HEAD -u &&
test_expect_code 128 git ls-files --with-tree=HEAD -s &&
test_expect_code 128 git ls-files --recurse-submodules --with-tree=HEAD
'
test_expect_success 'git ls-files --with-tree should succeed from subdir' ' test_expect_success 'git ls-files --with-tree should succeed from subdir' '
# We have to run from a sub-directory to trigger prune_path # We have to run from a sub-directory to trigger prune_path
# Then we finally get to run our --with-tree test # Then we finally get to run our --with-tree test
@ -60,4 +66,39 @@ test_expect_success \
'git ls-files --with-tree should add entries from named tree.' \ 'git ls-files --with-tree should add entries from named tree.' \
'test_cmp expected output' 'test_cmp expected output'
test_expect_success 'no duplicates in --with-tree output' '
git ls-files --with-tree=HEAD >actual &&
sort -u actual >expected &&
test_cmp expected actual
'
test_expect_success 'setup: output in a conflict' '
test_create_repo conflict &&
test_commit -C conflict BASE file &&
test_commit -C conflict A file foo &&
git -C conflict reset --hard BASE &&
test_commit -C conflict B file bar
'
test_expect_success 'output in a conflict' '
test_must_fail git -C conflict merge A B &&
cat >expected <<-\EOF &&
file
file
file
file
EOF
git -C conflict ls-files --with-tree=HEAD >actual &&
test_cmp expected actual
'
test_expect_success 'output with removed .git/index' '
cat >expected <<-\EOF &&
file
EOF
rm conflict/.git/index &&
git -C conflict ls-files --with-tree=HEAD >actual &&
test_cmp expected actual
'
test_done test_done