summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2006-03-03 10:20:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-03 19:28:33 (GMT)
commitd51fac53108b1822ba6b3ff8dd2cd242b40eaac5 (patch)
tree9336bf122cf89a37e4ef4d6924a1a4838695f684 /t
parent90924d55c5fc4205b2d41821a3288d478aa661a0 (diff)
downloadgit-d51fac53108b1822ba6b3ff8dd2cd242b40eaac5.zip
git-d51fac53108b1822ba6b3ff8dd2cd242b40eaac5.tar.gz
git-d51fac53108b1822ba6b3ff8dd2cd242b40eaac5.tar.bz2
workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t3600-rm.sh23
1 files changed, 17 insertions, 6 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index cabfadd..d1947e1 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -8,11 +8,20 @@ test_description='Test of the various options to git-rm.'
. ./test-lib.sh
# Setup some files to be removed, some with funny characters
-touch -- foo bar baz 'space embedded' 'tab embedded' 'newline
-embedded' -q
-git-add -- foo bar baz 'space embedded' 'tab embedded' 'newline
-embedded' -q
-git-commit -m "add files"
+touch -- foo bar baz 'space embedded' -q
+git-add -- foo bar baz 'space embedded' -q
+git-commit -m "add normal files"
+test_tabs=y
+if touch -- 'tab embedded' 'newline
+embedded'
+then
+git-add -- 'tab embedded' 'newline
+embedded'
+git-commit -m "add files with tabs and newlines"
+else
+ say 'Your filesystem does not allow tabs in filenames.'
+ test_tabs=n
+fi
test_expect_success \
'Pre-check that foo exists and is in index before git-rm foo' \
@@ -42,16 +51,18 @@ test_expect_success \
'Test that "git-rm -- -q" succeeds (remove a file that looks like an option)' \
'git-rm -- -q'
-test_expect_success \
+test "$test_tabs" = y && test_expect_success \
"Test that \"git-rm -f\" succeeds with embedded space, tab, or newline characters." \
"git-rm -f 'space embedded' 'tab embedded' 'newline
embedded'"
+if test "$test_tabs" = y; then
chmod u-w .
test_expect_failure \
'Test that "git-rm -f" fails if its rm fails' \
'git-rm -f baz'
chmod u+w .
+fi
test_expect_success \
'When the rm in "git-rm -f" fails, it should not remove the file from the index' \