diff options
Diffstat (limited to 'third_party/git/t/t3600-rm.sh')
| -rwxr-xr-x | third_party/git/t/t3600-rm.sh | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/third_party/git/t/t3600-rm.sh b/third_party/git/t/t3600-rm.sh index f2c0168941ad..66282a720ee8 100755 --- a/third_party/git/t/t3600-rm.sh +++ b/third_party/git/t/t3600-rm.sh @@ -113,10 +113,9 @@ test_expect_success '"rm" command printed' ' echo frotz >test-file && git add test-file && git commit -m "add file for rm test" && - git rm test-file >rm-output.raw && - grep "^rm " rm-output.raw >rm-output && - test_line_count = 1 rm-output && - rm -f test-file rm-output.raw rm-output && + git rm test-file >rm-output && + test $(grep "^rm " rm-output | wc -l) = 1 && + rm -f test-file rm-output && git commit -m "remove file from rm test" ' @@ -241,17 +240,14 @@ test_expect_success 'refresh index before checking if it is up-to-date' ' ' test_expect_success 'choking "git rm" should not let it die with cruft' ' - test_oid_init && git reset -q --hard && test_when_finished "rm -f .git/index.lock && git reset -q --hard" && i=0 && - hash=$(test_oid deadbeef) && while test $i -lt 12000 do - echo "100644 $hash 0 some-file-$i" + echo "100644 1234567890123456789012345678901234567890 0 some-file-$i" i=$(( $i + 1 )) done | git update-index --index-info && - # git command is intentionally placed upstream of pipe to induce SIGPIPE git rm -n "some-file-*" | : && test_path_is_missing .git/index.lock ' @@ -305,8 +301,7 @@ EOF test_expect_success 'rm removes empty submodules from work tree' ' mkdir submod && - hash=$(git rev-parse HEAD) && - git update-index --add --cacheinfo 160000 "$hash" submod && + git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod && git config -f .gitmodules submodule.sub.url ./. && git config -f .gitmodules submodule.sub.path submod && git submodule init && @@ -425,13 +420,6 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta git status -s -uno >actual && test_cmp expect actual ' -test_expect_success 'rm will not error out on .gitmodules file with zero stat data' ' - git reset --hard && - git submodule update && - git read-tree HEAD && - git rm submod && - test_path_is_missing submod -' test_expect_success 'rm issues a warning when section is not found in .gitmodules' ' git reset --hard && @@ -632,8 +620,7 @@ test_expect_success 'setup subsubmodule' ' git submodule update && ( cd submod && - hash=$(git rev-parse HEAD) && - git update-index --add --cacheinfo 160000 "$hash" subsubmod && + git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod && git config -f .gitmodules submodule.sub.url ../. && git config -f .gitmodules submodule.sub.path subsubmod && git submodule init && |