2006-02-21 23:04:51 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Carl D. Worth
|
|
|
|
#
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='Test of the various options to git rm.'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2006-02-23 00:37:27 +00:00
|
|
|
# Setup some files to be removed, some with funny characters
|
2006-05-29 08:06:48 +00:00
|
|
|
test_expect_success \
|
|
|
|
'Initialize test directory' \
|
|
|
|
"touch -- foo bar baz 'space embedded' -q &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git add -- foo bar baz 'space embedded' -q &&
|
2009-02-26 22:09:00 +00:00
|
|
|
git commit -m 'add normal files'"
|
|
|
|
|
|
|
|
if touch -- 'tab embedded' 'newline
|
|
|
|
embedded' 2>/dev/null
|
|
|
|
then
|
|
|
|
test_set_prereq FUNNYNAMES
|
|
|
|
else
|
|
|
|
say 'Your filesystem does not allow tabs in filenames.'
|
|
|
|
fi
|
|
|
|
|
|
|
|
test_expect_success FUNNYNAMES 'add files with funny names' "
|
2007-07-03 05:52:14 +00:00
|
|
|
git add -- 'tab embedded' 'newline
|
2006-05-29 08:06:48 +00:00
|
|
|
embedded' &&
|
2008-09-03 08:59:29 +00:00
|
|
|
git commit -m 'add files with tabs and newlines'
|
2009-02-26 22:09:00 +00:00
|
|
|
"
|
2009-03-17 21:45:22 +00:00
|
|
|
|
2006-02-21 23:04:51 +00:00
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Pre-check that foo exists and is in index before git rm foo' \
|
|
|
|
'[ -f foo ] && git ls-files --error-unmatch foo'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Test that git rm foo succeeds' \
|
|
|
|
'git rm --cached foo'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2007-07-13 17:41:38 +00:00
|
|
|
test_expect_success \
|
|
|
|
'Test that git rm --cached foo succeeds if the index matches the file' \
|
|
|
|
'echo content > foo
|
|
|
|
git add foo
|
|
|
|
git rm --cached foo'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'Test that git rm --cached foo succeeds if the index matches the file' \
|
|
|
|
'echo content > foo
|
|
|
|
git add foo
|
|
|
|
git commit -m foo
|
|
|
|
echo "other content" > foo
|
|
|
|
git rm --cached foo'
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
|
|
|
'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
|
|
|
|
echo content > foo
|
2007-07-13 17:41:38 +00:00
|
|
|
git add foo
|
|
|
|
git commit -m foo
|
|
|
|
echo "other content" > foo
|
|
|
|
git add foo
|
|
|
|
echo "yet another content" > foo
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git rm --cached foo
|
2008-02-01 09:50:53 +00:00
|
|
|
'
|
2007-07-13 17:41:38 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'Test that git rm --cached -f foo works in case where --cached only did not' \
|
|
|
|
'echo content > foo
|
|
|
|
git add foo
|
|
|
|
git commit -m foo
|
|
|
|
echo "other content" > foo
|
|
|
|
git add foo
|
|
|
|
echo "yet another content" > foo
|
|
|
|
git rm --cached -f foo'
|
|
|
|
|
2006-02-23 00:37:27 +00:00
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Post-check that foo exists but is not in index after git rm foo' \
|
2008-07-12 15:47:52 +00:00
|
|
|
'[ -f foo ] && test_must_fail git ls-files --error-unmatch foo'
|
2006-02-23 00:37:27 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Pre-check that bar exists and is in index before "git rm bar"' \
|
|
|
|
'[ -f bar ] && git ls-files --error-unmatch bar'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Test that "git rm bar" succeeds' \
|
|
|
|
'git rm bar'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2006-02-23 00:37:27 +00:00
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
|
2008-07-12 15:47:52 +00:00
|
|
|
'! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
|
|
|
|
'git rm -- -q'
|
2006-02-21 23:04:51 +00:00
|
|
|
|
2009-02-26 22:09:00 +00:00
|
|
|
test_expect_success FUNNYNAMES \
|
2007-07-03 05:52:14 +00:00
|
|
|
"Test that \"git rm -f\" succeeds with embedded space, tab, or newline characters." \
|
|
|
|
"git rm -f 'space embedded' 'tab embedded' 'newline
|
2006-02-23 00:37:27 +00:00
|
|
|
embedded'"
|
|
|
|
|
2010-12-14 18:19:09 +00:00
|
|
|
test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
|
2009-02-26 22:09:00 +00:00
|
|
|
chmod a-w . &&
|
|
|
|
test_must_fail git rm -f baz &&
|
|
|
|
chmod 775 .
|
|
|
|
'
|
2006-02-23 00:37:27 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 05:52:14 +00:00
|
|
|
'When the rm in "git rm -f" fails, it should not remove the file from the index' \
|
|
|
|
'git ls-files --error-unmatch baz'
|
2006-02-23 00:37:27 +00:00
|
|
|
|
2007-04-16 07:53:24 +00:00
|
|
|
test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
|
|
|
|
git rm --ignore-unmatch nonexistent
|
|
|
|
'
|
|
|
|
|
2007-04-16 07:46:48 +00:00
|
|
|
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 &&
|
2008-01-05 06:28:13 +00:00
|
|
|
test `grep "^rm " rm-output | wc -l` = 1 &&
|
2007-04-16 07:46:48 +00:00
|
|
|
rm -f test-file rm-output &&
|
|
|
|
git commit -m "remove file from rm test"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"rm" command suppressed with --quiet' '
|
|
|
|
echo frotz > test-file &&
|
|
|
|
git add test-file &&
|
|
|
|
git commit -m "add file for rm --quiet test" &&
|
|
|
|
git rm --quiet test-file > rm-output &&
|
|
|
|
test `wc -l < rm-output` = 0 &&
|
|
|
|
rm -f test-file rm-output &&
|
|
|
|
git commit -m "remove file from rm --quiet test"
|
|
|
|
'
|
|
|
|
|
2006-12-25 11:11:17 +00:00
|
|
|
# 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 &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git rm foo baz &&
|
2006-12-25 11:11:17 +00:00
|
|
|
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 &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git ls-files --error-unmatch foo &&
|
|
|
|
test_must_fail git ls-files --error-unmatch bar
|
2006-12-25 11:11:17 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
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' '
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git rm foo baz &&
|
2006-12-25 11:11:17 +00:00
|
|
|
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 &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git ls-files --error-unmatch foo
|
|
|
|
test_must_fail git ls-files --error-unmatch baz
|
2006-12-25 11:11:17 +00:00
|
|
|
'
|
|
|
|
|
2008-11-29 03:55:25 +00:00
|
|
|
test_expect_success 'refuse to remove cached empty file with modifications' '
|
|
|
|
>empty &&
|
rm: loosen safety valve for empty files
If a file is different between the working tree copy, the index, and the
HEAD, then we do not allow it to be deleted without --force.
However, this is overly tight in the face of "git add --intent-to-add":
$ git add --intent-to-add file
$ : oops, I don't actually want to stage that yet
$ git rm --cached file
error: 'empty' has staged content different from both the
file and the HEAD (use -f to force removal)
$ git rm -f --cached file
Unfortunately, there is currently no way to distinguish between an empty
file that has been added and an "intent to add" file. The ideal behavior
would be to disallow the former while allowing the latter.
This patch loosens the safety valve to allow the deletion only if we are
deleting the cached entry and the cached content is empty. This covers
the intent-to-add situation, and assumes there is little harm in not
protecting users who have legitimately added an empty file. In many
cases, the file will still be empty, in which case the safety valve does
not trigger anyway (since the content remains untouched in the working
tree). Otherwise, we do remove the fact that no content was staged, but
given that the content is by definition empty, it is not terribly
difficult for a user to recreate it.
However, we still document the desired behavior in the form of two
tests. One checks the correct removal of an intent-to-add file. The other
checks that we still disallow removal of empty files, but is marked as
expect_failure to indicate this compromise. If the intent-to-add feature
is ever extended to differentiate between normal empty files and
intent-to-add files, then the safety valve can be re-tightened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-10-21 13:54:19 +00:00
|
|
|
git add empty &&
|
|
|
|
echo content >empty &&
|
|
|
|
test_must_fail git rm --cached empty
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'remove intent-to-add file without --force' '
|
|
|
|
echo content >intent-to-add &&
|
|
|
|
git add -N intent-to-add
|
|
|
|
git rm --cached intent-to-add
|
|
|
|
'
|
|
|
|
|
2006-12-25 11:11:17 +00:00
|
|
|
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' '
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git rm frotz &&
|
2006-12-25 11:11:17 +00:00
|
|
|
test -d frotz &&
|
|
|
|
test -f frotz/nitfol
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'Recursive with -r but dirty' '
|
|
|
|
echo qfwfq >>frotz/nitfol
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git rm -r frotz &&
|
2006-12-25 11:11:17 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'Remove nonexistent file returns nonzero exit status' '
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git rm nonexistent
|
2007-04-16 07:46:48 +00:00
|
|
|
'
|
|
|
|
|
2008-07-19 16:24:46 +00:00
|
|
|
test_expect_success 'Call "rm" from outside the work tree' '
|
|
|
|
mkdir repo &&
|
2008-10-07 16:08:21 +00:00
|
|
|
(cd repo &&
|
|
|
|
git init &&
|
|
|
|
echo something > somefile &&
|
|
|
|
git add somefile &&
|
|
|
|
git commit -m "add a file" &&
|
|
|
|
(cd .. &&
|
|
|
|
git --git-dir=repo/.git --work-tree=repo rm somefile) &&
|
|
|
|
test_must_fail git ls-files --error-unmatch somefile)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'refresh index before checking if it is up-to-date' '
|
|
|
|
|
|
|
|
git reset --hard &&
|
|
|
|
test-chmtime -86400 frotz/nitfol &&
|
|
|
|
git rm frotz/nitfol &&
|
|
|
|
test ! -f frotz/nitfol
|
|
|
|
|
2008-07-19 16:24:46 +00:00
|
|
|
'
|
|
|
|
|
2008-12-19 01:31:57 +00:00
|
|
|
test_expect_success 'choking "git rm" should not let it die with cruft' '
|
|
|
|
git reset -q --hard &&
|
|
|
|
i=0 &&
|
|
|
|
while test $i -lt 12000
|
|
|
|
do
|
2011-04-24 05:34:13 +00:00
|
|
|
echo "100644 $_z40 0 some-file-$i"
|
2008-12-19 01:31:57 +00:00
|
|
|
i=$(( $i + 1 ))
|
|
|
|
done | git update-index --index-info &&
|
|
|
|
git rm -n "some-file-*" | :;
|
|
|
|
test -f .git/index.lock
|
|
|
|
status=$?
|
|
|
|
rm -f .git/index.lock
|
|
|
|
git reset -q --hard
|
|
|
|
test "$status" != 0
|
|
|
|
'
|
|
|
|
|
2010-02-19 05:57:21 +00:00
|
|
|
test_expect_success 'rm removes subdirectories recursively' '
|
|
|
|
mkdir -p dir/subdir/subsubdir &&
|
|
|
|
echo content >dir/subdir/subsubdir/file &&
|
|
|
|
git add dir/subdir/subsubdir/file &&
|
|
|
|
git rm -f dir/subdir/subsubdir/file &&
|
|
|
|
! test -d dir
|
|
|
|
'
|
|
|
|
|
2006-02-21 23:04:51 +00:00
|
|
|
test_done
|