This patch causes the failure cases for the "git rm" command to be tested. Specifically it tests that if the first removal fails the operation is aborted with an error message, and that if subsequent removals fail, the operation proceeds. Based-on-work-by: Jonathan Nieder <jrnieder@xxxxxxxxx> Signed-off-by: Peter Collingbourne <peter@xxxxxxxxx> --- t/t3600-rm.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 0aaf0ad..5186844 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -126,6 +126,60 @@ test_expect_success 'Remove nonexistent file with --ignore-unmatch' ' git rm --ignore-unmatch nonexistent ' +test_expect_success 'If the first (in alphabetical order) removal fails, rm is cancelled' ' + touch xyzzy && + mkdir -p plugh && + touch plugh/xyzzy && + git add xyzzy plugh/xyzzy && + git commit --allow-empty -a -m "two files to remove" && + chmod a-w plugh && + git ls-files --stage >before && + test $(grep xyzzy before | wc -l) = 2 && + + test_must_fail git rm xyzzy plugh/xyzzy && + + test -e plugh/xyzzy && + test -e xyzzy && + git ls-files --stage >after && + test_cmp before after +' +! test -e plugh || chmod 775 plugh +rm -fr before after plugh xyzzy + +test_expect_success 'Best-effort behavior if the second removal fails' ' + touch plugh && + mkdir -p xyzzy && + touch xyzzy/plugh && + git add plugh xyzzy/plugh && + git commit --allow-empty -a -m "two files to remove" && + chmod a-w xyzzy && + : >expect && + + git rm plugh xyzzy/plugh && + + test -e xyzzy/plugh && + ! test -e plugh && + git ls-files --stage plugh xyzzy/plugh >actual && + test_cmp expect actual +' +! test -e xyzzy || chmod 775 xyzzy +rm -fr expect actual plugh xyzzy + +test_expect_success 'Message when first removal fails' ' + touch xyzzy && + mkdir -p plugh && + touch plugh/xyzzy && + git add xyzzy plugh/xyzzy && + git commit --allow-empty -a -m "two files to remove" && + chmod a-w plugh && + + test_must_fail git rm xyzzy plugh/xyzzy 2>msg && + + grep "git rm: '\''plugh/xyzzy'\'':" msg +' +! test -e plugh || chmod 775 plugh +rm -fr msg plugh xyzzy + test_expect_success '"rm" command printed' ' echo frotz > test-file && git add test-file && -- 1.6.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html