aboutsummaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-25 03:11:17 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-25 03:29:08 -0800
commit467e1b5383c214e9562b2dc575ac027c54aa4fba (patch)
tree456f5858f10adec6f3b600b086003cbd5b818765 /t/t3600-rm.sh
parent9f95069beb507f496c8d3005defbaa27318f5347 (diff)
downloadgit-467e1b5383c214e9562b2dc575ac027c54aa4fba.tar.gz
git-467e1b5383c214e9562b2dc575ac027c54aa4fba.tar.xz
t3600: update the test for updated git rm
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh78
1 files changed, 74 insertions, 4 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 201d1642d..e31cf93a0 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -43,19 +43,19 @@ test_expect_success \
test_expect_success \
'Test that git-rm foo succeeds' \
- 'git-rm foo'
+ 'git-rm --cached foo'
test_expect_success \
'Post-check that foo exists but is not in index after git-rm foo' \
'[ -f foo ] && ! git-ls-files --error-unmatch foo'
test_expect_success \
- 'Pre-check that bar exists and is in index before "git-rm -f bar"' \
+ 'Pre-check that bar exists and is in index before "git-rm bar"' \
'[ -f bar ] && git-ls-files --error-unmatch bar'
test_expect_success \
- 'Test that "git-rm -f bar" succeeds' \
- 'git-rm -f bar'
+ 'Test that "git-rm bar" succeeds' \
+ 'git-rm bar'
test_expect_success \
'Post-check that bar does not exist and is not in index after "git-rm -f bar"' \
@@ -84,4 +84,74 @@ test_expect_success \
'When the rm in "git-rm -f" fails, it should not remove the file from the index' \
'git-ls-files --error-unmatch baz'
+# Now, failure cases.
+test_expect_success 'Re-add foo and baz' '
+ git add foo baz &&
+ git ls-files --error-unmatch foo baz
+'
+
+test_expect_success 'Modify foo -- rm should refuse' '
+ echo >>foo &&
+ ! git rm foo baz &&
+ test -f foo &&
+ test -f baz &&
+ git ls-files --error-unmatch foo baz
+'
+
+test_expect_success 'Modified foo -- rm -f should work' '
+ git rm -f foo baz &&
+ test ! -f foo &&
+ test ! -f baz &&
+ ! git ls-files --error-unmatch foo &&
+ ! git ls-files --error-unmatch bar
+'
+
+test_expect_success 'Re-add foo and baz for HEAD tests' '
+ echo frotz >foo &&
+ git checkout HEAD -- baz &&
+ git add foo baz &&
+ git ls-files --error-unmatch foo baz
+'
+
+test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
+ ! git rm foo baz &&
+ test -f foo &&
+ test -f baz &&
+ git ls-files --error-unmatch foo baz
+'
+
+test_expect_success 'but with -f it should work.' '
+ git rm -f foo baz &&
+ test ! -f foo &&
+ test ! -f baz &&
+ ! git ls-files --error-unmatch foo
+ ! git ls-files --error-unmatch baz
+'
+
+test_expect_success 'Recursive test setup' '
+ mkdir -p frotz &&
+ echo qfwfq >frotz/nitfol &&
+ git add frotz &&
+ git commit -m "subdir test"
+'
+
+test_expect_success 'Recursive without -r fails' '
+ ! git rm frotz &&
+ test -d frotz &&
+ test -f frotz/nitfol
+'
+
+test_expect_success 'Recursive with -r but dirty' '
+ echo qfwfq >>frotz/nitfol
+ ! git rm -r frotz &&
+ test -d frotz &&
+ test -f frotz/nitfol
+'
+
+test_expect_success 'Recursive with -r -f' '
+ git rm -f -r frotz &&
+ ! test -f frotz/nitfol &&
+ ! test -d frotz
+'
+
test_done