diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-02 23:10:05 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 23:10:05 (GMT) |
commit | c40610422e1157e71dbc3c1a2f9e19bbe117962f (patch) | |
tree | 251299eef1d983dfdcff8c6455e968234c6d0a56 /t/t3600-rm.sh | |
parent | cbfb73d73f272f194bafa70d5be1f35abc265c79 (diff) | |
parent | 765ac8ec469f110e88376e4fac05d0ed475bcb28 (diff) | |
download | git-c40610422e1157e71dbc3c1a2f9e19bbe117962f.zip git-c40610422e1157e71dbc3c1a2f9e19bbe117962f.tar.gz git-c40610422e1157e71dbc3c1a2f9e19bbe117962f.tar.bz2 |
Merge part of 'lt/rev-list' into 'fk/blame'
Now blame will depend on the new revision walker infrastructure,
we need to make it depend on earlier parts of Linus' rev-list
topic branch, hence this merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-x | t/t3600-rm.sh | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh new file mode 100755 index 0000000..cabfadd --- /dev/null +++ b/t/t3600-rm.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Copyright (c) 2006 Carl D. Worth +# + +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" + +test_expect_success \ + 'Pre-check that foo exists and is in index before git-rm foo' \ + '[ -f foo ] && git-ls-files --error-unmatch foo' + +test_expect_success \ + 'Test that git-rm foo succeeds' \ + 'git-rm 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"' \ + '[ -f bar ] && git-ls-files --error-unmatch bar' + +test_expect_success \ + 'Test that "git-rm -f bar" succeeds' \ + 'git-rm -f bar' + +test_expect_success \ + 'Post-check that bar does not exist and is not in index after "git-rm -f bar"' \ + '! [ -f bar ] && ! git-ls-files --error-unmatch bar' + +test_expect_success \ + 'Test that "git-rm -- -q" succeeds (remove a file that looks like an option)' \ + 'git-rm -- -q' + +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'" + +chmod u-w . +test_expect_failure \ + 'Test that "git-rm -f" fails if its rm fails' \ + 'git-rm -f baz' +chmod u+w . + +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' + +test_done |