2006-02-22 00:04:51 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2006 Carl D. Worth
|
|
|
|
|
#
|
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
test_description='Test of the various options to git rm.'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2006-02-23 01:37:27 +01:00
|
|
|
# Setup some files to be removed, some with funny characters
|
2006-05-29 10:06:48 +02:00
|
|
|
test_expect_success \
|
|
|
|
|
'Initialize test directory' \
|
|
|
|
|
"touch -- foo bar baz 'space embedded' -q &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git add -- foo bar baz 'space embedded' -q &&
|
2009-02-26 23:09:00 +01:00
|
|
|
git commit -m 'add normal files'"
|
|
|
|
|
|
t: factor out FUNNYNAMES as shared lazy prereq
A fair number of tests need to check that the filesystem supports file
names including "funny" characters, like newline, tab, and double-quote.
Jonathan Nieder suggested that this be extracted into a lazy prereq in
the top-level `test-lib.sh`. This patch effects that change.
The FUNNYNAMES prereq now uniformly requires support for newlines, tabs,
and double-quotes in filenames. This very slightly decreases the power
of some tests, which might have run previously on a system that supports
(e.g.) newlines and tabs but not double-quotes, but now will not. This
seems to me like an acceptable tradeoff for consistency.
One test (`t/t9902-completion.sh`) defined FUNNYNAMES to further require
the separators \034 through \037, the test for which was implemented
using the Bash-specific $'\034' syntax. I've elected to leave this one
as is, renaming it to FUNNIERNAMES.
After this patch, `git grep 'test_\(set\|lazy\)_prereq.*FUNNYNAMES'` has
only one result.
Signed-off-by: William Chargin <wchargin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-06 20:35:08 +02:00
|
|
|
if test_have_prereq !FUNNYNAMES; then
|
2009-02-26 23:09:00 +01:00
|
|
|
say 'Your filesystem does not allow tabs in filenames.'
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
test_expect_success FUNNYNAMES 'add files with funny names' "
|
t: factor out FUNNYNAMES as shared lazy prereq
A fair number of tests need to check that the filesystem supports file
names including "funny" characters, like newline, tab, and double-quote.
Jonathan Nieder suggested that this be extracted into a lazy prereq in
the top-level `test-lib.sh`. This patch effects that change.
The FUNNYNAMES prereq now uniformly requires support for newlines, tabs,
and double-quotes in filenames. This very slightly decreases the power
of some tests, which might have run previously on a system that supports
(e.g.) newlines and tabs but not double-quotes, but now will not. This
seems to me like an acceptable tradeoff for consistency.
One test (`t/t9902-completion.sh`) defined FUNNYNAMES to further require
the separators \034 through \037, the test for which was implemented
using the Bash-specific $'\034' syntax. I've elected to leave this one
as is, renaming it to FUNNIERNAMES.
After this patch, `git grep 'test_\(set\|lazy\)_prereq.*FUNNYNAMES'` has
only one result.
Signed-off-by: William Chargin <wchargin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-06 20:35:08 +02:00
|
|
|
touch -- 'tab embedded' 'newline
|
|
|
|
|
embedded' &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git add -- 'tab embedded' 'newline
|
2006-05-29 10:06:48 +02:00
|
|
|
embedded' &&
|
2008-09-03 10:59:29 +02:00
|
|
|
git commit -m 'add files with tabs and newlines'
|
2009-02-26 23:09:00 +01:00
|
|
|
"
|
2009-03-17 22:45:22 +01:00
|
|
|
|
2006-02-22 00:04:51 +01:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Pre-check that foo exists and is in index before git rm foo' \
|
|
|
|
|
'[ -f foo ] && git ls-files --error-unmatch foo'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Test that git rm foo succeeds' \
|
|
|
|
|
'git rm --cached foo'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
2007-07-13 19:41:38 +02:00
|
|
|
test_expect_success \
|
|
|
|
|
'Test that git rm --cached foo succeeds if the index matches the file' \
|
t3600: fix &&-chain breakage for setup commands
As with the earlier patch to fix "trivial" &&-chain
breakage, these missing "&&" operators are not a serious
problem (e.g., we do not expect "echo" to fail).
Ironically, however, inserting them shows that some of the
commands _do_ fail. Specifically, some of the tests start by
making sure we are at a commit with the string "content" in
the file "foo". However, running "git commit" may fail
because the previous test left us in that state already, and
there is nothing to commit.
We could remove these commands entirely, but they serve to
document the test's assumptions, as well as make it robust
when an earlier test has failed. We could use test_might_fail
to handle all cases, but that would miss an unrelated
failure to make the commit. Instead, we can just pass the
--allow-empty flag to git-commit, which means that it will
not complain if our setup is a noop.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-20 11:12:51 +01:00
|
|
|
'echo content >foo &&
|
|
|
|
|
git add foo &&
|
2007-07-13 19:41:38 +02:00
|
|
|
git rm --cached foo'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'Test that git rm --cached foo succeeds if the index matches the file' \
|
t3600: fix &&-chain breakage for setup commands
As with the earlier patch to fix "trivial" &&-chain
breakage, these missing "&&" operators are not a serious
problem (e.g., we do not expect "echo" to fail).
Ironically, however, inserting them shows that some of the
commands _do_ fail. Specifically, some of the tests start by
making sure we are at a commit with the string "content" in
the file "foo". However, running "git commit" may fail
because the previous test left us in that state already, and
there is nothing to commit.
We could remove these commands entirely, but they serve to
document the test's assumptions, as well as make it robust
when an earlier test has failed. We could use test_might_fail
to handle all cases, but that would miss an unrelated
failure to make the commit. Instead, we can just pass the
--allow-empty flag to git-commit, which means that it will
not complain if our setup is a noop.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-20 11:12:51 +01:00
|
|
|
'echo content >foo &&
|
|
|
|
|
git add foo &&
|
|
|
|
|
git commit -m foo &&
|
|
|
|
|
echo "other content" >foo &&
|
2007-07-13 19:41:38 +02:00
|
|
|
git rm --cached foo'
|
|
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success \
|
|
|
|
|
'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
|
t3600: fix &&-chain breakage for setup commands
As with the earlier patch to fix "trivial" &&-chain
breakage, these missing "&&" operators are not a serious
problem (e.g., we do not expect "echo" to fail).
Ironically, however, inserting them shows that some of the
commands _do_ fail. Specifically, some of the tests start by
making sure we are at a commit with the string "content" in
the file "foo". However, running "git commit" may fail
because the previous test left us in that state already, and
there is nothing to commit.
We could remove these commands entirely, but they serve to
document the test's assumptions, as well as make it robust
when an earlier test has failed. We could use test_might_fail
to handle all cases, but that would miss an unrelated
failure to make the commit. Instead, we can just pass the
--allow-empty flag to git-commit, which means that it will
not complain if our setup is a noop.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-20 11:12:51 +01:00
|
|
|
echo content >foo &&
|
|
|
|
|
git add foo &&
|
|
|
|
|
git commit -m foo --allow-empty &&
|
|
|
|
|
echo "other content" >foo &&
|
|
|
|
|
git add foo &&
|
|
|
|
|
echo "yet another content" >foo &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git rm --cached foo
|
2008-02-01 10:50:53 +01:00
|
|
|
'
|
2007-07-13 19:41:38 +02:00
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'Test that git rm --cached -f foo works in case where --cached only did not' \
|
t3600: fix &&-chain breakage for setup commands
As with the earlier patch to fix "trivial" &&-chain
breakage, these missing "&&" operators are not a serious
problem (e.g., we do not expect "echo" to fail).
Ironically, however, inserting them shows that some of the
commands _do_ fail. Specifically, some of the tests start by
making sure we are at a commit with the string "content" in
the file "foo". However, running "git commit" may fail
because the previous test left us in that state already, and
there is nothing to commit.
We could remove these commands entirely, but they serve to
document the test's assumptions, as well as make it robust
when an earlier test has failed. We could use test_might_fail
to handle all cases, but that would miss an unrelated
failure to make the commit. Instead, we can just pass the
--allow-empty flag to git-commit, which means that it will
not complain if our setup is a noop.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-20 11:12:51 +01:00
|
|
|
'echo content >foo &&
|
|
|
|
|
git add foo &&
|
|
|
|
|
git commit -m foo --allow-empty &&
|
|
|
|
|
echo "other content" >foo &&
|
|
|
|
|
git add foo &&
|
|
|
|
|
echo "yet another content" >foo &&
|
2007-07-13 19:41:38 +02:00
|
|
|
git rm --cached -f foo'
|
|
|
|
|
|
2006-02-23 01:37:27 +01:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Post-check that foo exists but is not in index after git rm foo' \
|
2008-07-12 17:47:52 +02:00
|
|
|
'[ -f foo ] && test_must_fail git ls-files --error-unmatch foo'
|
2006-02-23 01:37:27 +01:00
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Pre-check that bar exists and is in index before "git rm bar"' \
|
|
|
|
|
'[ -f bar ] && git ls-files --error-unmatch bar'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Test that "git rm bar" succeeds' \
|
|
|
|
|
'git rm bar'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
2006-02-23 01:37:27 +01:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
|
2008-07-12 17:47:52 +02:00
|
|
|
'! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
|
|
|
|
|
'git rm -- -q'
|
2006-02-22 00:04:51 +01:00
|
|
|
|
2009-02-26 23:09:00 +01:00
|
|
|
test_expect_success FUNNYNAMES \
|
2007-07-03 07:52:14 +02: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 01:37:27 +01:00
|
|
|
embedded'"
|
|
|
|
|
|
2010-12-14 19:19:09 +01:00
|
|
|
test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
|
2017-05-22 16:17:31 +02:00
|
|
|
test_when_finished "chmod 775 ." &&
|
2009-02-26 23:09:00 +01:00
|
|
|
chmod a-w . &&
|
2017-05-22 16:17:31 +02:00
|
|
|
test_must_fail git rm -f baz
|
2009-02-26 23:09:00 +01:00
|
|
|
'
|
2006-02-23 01:37:27 +01:00
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02: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 01:37:27 +01:00
|
|
|
|
2007-04-16 09:53:24 +02:00
|
|
|
test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
|
|
|
|
|
git rm --ignore-unmatch nonexistent
|
|
|
|
|
'
|
|
|
|
|
|
2007-04-16 09:46:48 +02:00
|
|
|
test_expect_success '"rm" command printed' '
|
2016-12-13 00:54:55 +01:00
|
|
|
echo frotz >test-file &&
|
2007-04-16 09:46:48 +02:00
|
|
|
git add test-file &&
|
|
|
|
|
git commit -m "add file for rm test" &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git rm test-file >rm-output &&
|
2015-12-22 16:27:48 +01:00
|
|
|
test $(grep "^rm " rm-output | wc -l) = 1 &&
|
2007-04-16 09:46:48 +02:00
|
|
|
rm -f test-file rm-output &&
|
|
|
|
|
git commit -m "remove file from rm test"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '"rm" command suppressed with --quiet' '
|
2016-12-13 00:54:55 +01:00
|
|
|
echo frotz >test-file &&
|
2007-04-16 09:46:48 +02:00
|
|
|
git add test-file &&
|
|
|
|
|
git commit -m "add file for rm --quiet test" &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git rm --quiet test-file >rm-output &&
|
|
|
|
|
test_must_be_empty rm-output &&
|
2007-04-16 09:46:48 +02:00
|
|
|
rm -f test-file rm-output &&
|
|
|
|
|
git commit -m "remove file from rm --quiet test"
|
|
|
|
|
'
|
|
|
|
|
|
2006-12-25 12:11:17 +01: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 17:47:52 +02:00
|
|
|
test_must_fail git rm foo baz &&
|
2006-12-25 12:11:17 +01: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 17:47:52 +02:00
|
|
|
test_must_fail git ls-files --error-unmatch foo &&
|
|
|
|
|
test_must_fail git ls-files --error-unmatch bar
|
2006-12-25 12:11:17 +01: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 17:47:52 +02:00
|
|
|
test_must_fail git rm foo baz &&
|
2006-12-25 12:11:17 +01: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 &&
|
2015-03-20 11:06:15 +01:00
|
|
|
test_must_fail git ls-files --error-unmatch foo &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git ls-files --error-unmatch baz
|
2006-12-25 12:11:17 +01:00
|
|
|
'
|
|
|
|
|
|
2008-11-29 04:55:25 +01: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 15:54:19 +02: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 &&
|
2015-03-20 11:07:15 +01:00
|
|
|
git add -N intent-to-add &&
|
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 15:54:19 +02:00
|
|
|
git rm --cached intent-to-add
|
|
|
|
|
'
|
|
|
|
|
|
2006-12-25 12:11:17 +01: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 17:47:52 +02:00
|
|
|
test_must_fail git rm frotz &&
|
2006-12-25 12:11:17 +01:00
|
|
|
test -d frotz &&
|
|
|
|
|
test -f frotz/nitfol
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'Recursive with -r but dirty' '
|
2015-03-20 11:07:15 +01:00
|
|
|
echo qfwfq >>frotz/nitfol &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git rm -r frotz &&
|
2006-12-25 12:11:17 +01: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 10:50:53 +01:00
|
|
|
test_expect_success 'Remove nonexistent file returns nonzero exit status' '
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git rm nonexistent
|
2007-04-16 09:46:48 +02:00
|
|
|
'
|
|
|
|
|
|
2008-07-19 18:24:46 +02:00
|
|
|
test_expect_success 'Call "rm" from outside the work tree' '
|
|
|
|
|
mkdir repo &&
|
2008-10-07 18:08:21 +02:00
|
|
|
(cd repo &&
|
|
|
|
|
git init &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo something >somefile &&
|
2008-10-07 18:08:21 +02:00
|
|
|
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 &&
|
2018-03-24 08:44:31 +01:00
|
|
|
test-tool chmtime -86400 frotz/nitfol &&
|
2008-10-07 18:08:21 +02:00
|
|
|
git rm frotz/nitfol &&
|
|
|
|
|
test ! -f frotz/nitfol
|
|
|
|
|
|
2008-07-19 18:24:46 +02:00
|
|
|
'
|
|
|
|
|
|
2008-12-19 02:31:57 +01:00
|
|
|
test_expect_success 'choking "git rm" should not let it die with cruft' '
|
|
|
|
|
git reset -q --hard &&
|
2013-10-16 02:48:57 +02:00
|
|
|
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
|
2008-12-19 02:31:57 +01:00
|
|
|
i=0 &&
|
|
|
|
|
while test $i -lt 12000
|
|
|
|
|
do
|
2013-10-16 02:48:57 +02:00
|
|
|
echo "100644 1234567890123456789012345678901234567890 0 some-file-$i"
|
2008-12-19 02:31:57 +01:00
|
|
|
i=$(( $i + 1 ))
|
|
|
|
|
done | git update-index --index-info &&
|
2013-10-16 02:48:57 +02:00
|
|
|
git rm -n "some-file-*" | : &&
|
|
|
|
|
test_path_is_missing .git/index.lock
|
2008-12-19 02:31:57 +01:00
|
|
|
'
|
|
|
|
|
|
2010-02-19 06:57:21 +01: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
|
|
|
|
|
'
|
|
|
|
|
|
2012-09-26 20:21:13 +02:00
|
|
|
cat >expect <<EOF
|
2013-08-06 21:15:25 +02:00
|
|
|
M .gitmodules
|
2012-09-26 20:21:13 +02:00
|
|
|
D submod
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >expect.modified <<EOF
|
|
|
|
|
M submod
|
|
|
|
|
EOF
|
|
|
|
|
|
short status: improve reporting for submodule changes
If I add an untracked file to a submodule or modify a tracked file,
currently "git status --short" treats the change in the same way as
changes to the current HEAD of the submodule:
$ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit
$ echo hello >gerrit/plugins/replication/stray-file
$ sed -i -e 's/.*//' gerrit/plugins/replication/.mailmap
$ git -C gerrit status --short
M plugins/replication
This is by analogy with ordinary files, where "M" represents a change
that has not been added yet to the index. But this change cannot be
added to the index without entering the submodule, "git add"-ing it,
and running "git commit", so the analogy is counterproductive.
Introduce new status letters " ?" and " m" for this. These are similar
to the existing "??" and " M" but mean that the submodule (not the
parent project) has new untracked files and modified files, respectively.
The user can use "git add" and "git commit" from within the submodule to
add them.
Changes to the submodule's HEAD commit can be recorded in the index with
a plain "git add -u" and are shown with " M", like today.
To avoid excessive clutter, show at most one of " ?", " m", and " M" for
the submodule. They represent increasing levels of change --- the last
one that applies is shown (e.g., " m" if there are both modified files
and untracked files in the submodule, or " M" if the submodule's HEAD
has been modified and it has untracked files).
While making these changes, we need to make sure to not break porcelain
level 1, which shares code with "status --short". We only change
"git status --short".
Non-short "git status" and "git status --porcelain=2" already handle
these cases by showing more detail:
$ git -C gerrit status --porcelain=2
1 .M S.MU 160000 160000 160000 305c864db28eb0c77c8499bc04c87de3f849cf3c 305c864db28eb0c77c8499bc04c87de3f849cf3c plugins/replication
$ git -C gerrit status
[...]
modified: plugins/replication (modified content, untracked content)
Scripts caring about these distinctions should use --porcelain=2.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-30 00:26:15 +02:00
|
|
|
cat >expect.modified_inside <<EOF
|
|
|
|
|
m submod
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >expect.modified_untracked <<EOF
|
|
|
|
|
? submod
|
|
|
|
|
EOF
|
|
|
|
|
|
2013-08-06 21:15:25 +02:00
|
|
|
cat >expect.cached <<EOF
|
|
|
|
|
D submod
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >expect.both_deleted<<EOF
|
|
|
|
|
D .gitmodules
|
|
|
|
|
D submod
|
|
|
|
|
EOF
|
|
|
|
|
|
2012-09-26 20:21:13 +02:00
|
|
|
test_expect_success 'rm removes empty submodules from work tree' '
|
|
|
|
|
mkdir submod &&
|
|
|
|
|
git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
|
|
|
|
|
git config -f .gitmodules submodule.sub.url ./. &&
|
|
|
|
|
git config -f .gitmodules submodule.sub.path submod &&
|
|
|
|
|
git submodule init &&
|
|
|
|
|
git add .gitmodules &&
|
|
|
|
|
git commit -m "add submodule" &&
|
|
|
|
|
git rm submod &&
|
|
|
|
|
test ! -e submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.path
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
2013-08-06 21:15:25 +02:00
|
|
|
test_expect_success 'rm removes removed submodule from index and .gitmodules' '
|
2012-09-26 20:21:13 +02:00
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
rm -rf submod &&
|
|
|
|
|
git rm submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.path
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm removes work tree of unmodified submodules' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git rm submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.path
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
2012-11-22 23:32:26 +01:00
|
|
|
test_expect_success 'rm removes a submodule with a trailing /' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git rm submod/ &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-11-22 23:32:26 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm fails when given a file with a trailing /' '
|
|
|
|
|
test_must_fail git rm empty/
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm succeeds when given a directory with a trailing /' '
|
|
|
|
|
git rm -r frotz/
|
|
|
|
|
'
|
|
|
|
|
|
2012-09-26 20:21:13 +02:00
|
|
|
test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git -C submod checkout HEAD^ &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect.modified actual &&
|
|
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.path
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm --cached leaves work tree of populated submodules and .gitmodules alone' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git rm --cached submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
|
|
|
|
git status -s -uno >actual &&
|
|
|
|
|
test_cmp expect.cached actual &&
|
|
|
|
|
git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
git config -f .gitmodules submodule.sub.path
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm --dry-run does not touch the submodule or .gitmodules' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git rm -n submod &&
|
|
|
|
|
test -f submod/.git &&
|
|
|
|
|
git diff-index --exit-code HEAD
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm does not complain when no .gitmodules file is found' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git rm .gitmodules &&
|
|
|
|
|
git rm submod >actual 2>actual.err &&
|
2018-08-19 23:57:22 +02:00
|
|
|
test_must_be_empty actual.err &&
|
2013-08-06 21:15:25 +02:00
|
|
|
! test -d submod &&
|
|
|
|
|
! test -f submod/.git &&
|
|
|
|
|
git status -s -uno >actual &&
|
|
|
|
|
test_cmp expect.both_deleted actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm will error out on a modified .gitmodules file unless staged' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git config -f .gitmodules foo.bar true &&
|
|
|
|
|
test_must_fail git rm submod >actual 2>actual.err &&
|
|
|
|
|
test -s actual.err &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
|
|
|
|
git diff-files --quiet -- submod &&
|
|
|
|
|
git add .gitmodules &&
|
|
|
|
|
git rm submod >actual 2>actual.err &&
|
2018-08-19 23:57:22 +02:00
|
|
|
test_must_be_empty actual.err &&
|
2013-08-06 21:15:25 +02:00
|
|
|
! test -d submod &&
|
|
|
|
|
! test -f submod/.git &&
|
|
|
|
|
git status -s -uno >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm issues a warning when section is not found in .gitmodules' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git config -f .gitmodules --remove-section submodule.sub &&
|
|
|
|
|
git add .gitmodules &&
|
|
|
|
|
echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
|
|
|
|
|
git rm submod >actual 2>actual.err &&
|
|
|
|
|
test_i18ncmp expect.err actual.err &&
|
|
|
|
|
! test -d submod &&
|
|
|
|
|
! test -f submod/.git &&
|
|
|
|
|
git status -s -uno >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a populated submodule with modifications fails unless forced' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo X >submod/empty &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
short status: improve reporting for submodule changes
If I add an untracked file to a submodule or modify a tracked file,
currently "git status --short" treats the change in the same way as
changes to the current HEAD of the submodule:
$ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit
$ echo hello >gerrit/plugins/replication/stray-file
$ sed -i -e 's/.*//' gerrit/plugins/replication/.mailmap
$ git -C gerrit status --short
M plugins/replication
This is by analogy with ordinary files, where "M" represents a change
that has not been added yet to the index. But this change cannot be
added to the index without entering the submodule, "git add"-ing it,
and running "git commit", so the analogy is counterproductive.
Introduce new status letters " ?" and " m" for this. These are similar
to the existing "??" and " M" but mean that the submodule (not the
parent project) has new untracked files and modified files, respectively.
The user can use "git add" and "git commit" from within the submodule to
add them.
Changes to the submodule's HEAD commit can be recorded in the index with
a plain "git add -u" and are shown with " M", like today.
To avoid excessive clutter, show at most one of " ?", " m", and " M" for
the submodule. They represent increasing levels of change --- the last
one that applies is shown (e.g., " m" if there are both modified files
and untracked files in the submodule, or " M" if the submodule's HEAD
has been modified and it has untracked files).
While making these changes, we need to make sure to not break porcelain
level 1, which shares code with "status --short". We only change
"git status --short".
Non-short "git status" and "git status --porcelain=2" already handle
these cases by showing more detail:
$ git -C gerrit status --porcelain=2
1 .M S.MU 160000 160000 160000 305c864db28eb0c77c8499bc04c87de3f849cf3c 305c864db28eb0c77c8499bc04c87de3f849cf3c plugins/replication
$ git -C gerrit status
[...]
modified: plugins/replication (modified content, untracked content)
Scripts caring about these distinctions should use --porcelain=2.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-30 00:26:15 +02:00
|
|
|
test_cmp expect.modified_inside actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a populated submodule with untracked files fails unless forced' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo X >submod/untracked &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
short status: improve reporting for submodule changes
If I add an untracked file to a submodule or modify a tracked file,
currently "git status --short" treats the change in the same way as
changes to the current HEAD of the submodule:
$ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit
$ echo hello >gerrit/plugins/replication/stray-file
$ sed -i -e 's/.*//' gerrit/plugins/replication/.mailmap
$ git -C gerrit status --short
M plugins/replication
This is by analogy with ordinary files, where "M" represents a change
that has not been added yet to the index. But this change cannot be
added to the index without entering the submodule, "git add"-ing it,
and running "git commit", so the analogy is counterproductive.
Introduce new status letters " ?" and " m" for this. These are similar
to the existing "??" and " M" but mean that the submodule (not the
parent project) has new untracked files and modified files, respectively.
The user can use "git add" and "git commit" from within the submodule to
add them.
Changes to the submodule's HEAD commit can be recorded in the index with
a plain "git add -u" and are shown with " M", like today.
To avoid excessive clutter, show at most one of " ?", " m", and " M" for
the submodule. They represent increasing levels of change --- the last
one that applies is shown (e.g., " m" if there are both modified files
and untracked files in the submodule, or " M" if the submodule's HEAD
has been modified and it has untracked files).
While making these changes, we need to make sure to not break porcelain
level 1, which shares code with "status --short". We only change
"git status --short".
Non-short "git status" and "git status --porcelain=2" already handle
these cases by showing more detail:
$ git -C gerrit status --porcelain=2
1 .M S.MU 160000 160000 160000 305c864db28eb0c77c8499bc04c87de3f849cf3c 305c864db28eb0c77c8499bc04c87de3f849cf3c plugins/replication
$ git -C gerrit status
[...]
modified: plugins/replication (modified content, untracked content)
Scripts caring about these distinctions should use --porcelain=2.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-30 00:26:15 +02:00
|
|
|
test_cmp expect.modified_untracked actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup submodule conflict' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
git checkout -b branch1 &&
|
|
|
|
|
echo 1 >nitfol &&
|
|
|
|
|
git add nitfol &&
|
|
|
|
|
git commit -m "added nitfol 1" &&
|
|
|
|
|
git checkout -b branch2 master &&
|
|
|
|
|
echo 2 >nitfol &&
|
|
|
|
|
git add nitfol &&
|
|
|
|
|
git commit -m "added nitfol 2" &&
|
|
|
|
|
git checkout -b conflict1 master &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git -C submod fetch &&
|
|
|
|
|
git -C submod checkout branch1 &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git add submod &&
|
|
|
|
|
git commit -m "submod 1" &&
|
|
|
|
|
git checkout -b conflict2 master &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git -C submod checkout branch2 &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git add submod &&
|
|
|
|
|
git commit -m "submod 2"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
cat >expect.conflict <<EOF
|
|
|
|
|
UU submod
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm removes work tree of unmodified conflicted submodule' '
|
|
|
|
|
git checkout conflict1 &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
test_must_fail git merge conflict2 &&
|
|
|
|
|
git rm submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a conflicted populated submodule with different HEAD fails unless forced' '
|
|
|
|
|
git checkout conflict1 &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git -C submod checkout HEAD^ &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git merge conflict2 &&
|
|
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect.conflict actual &&
|
|
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.path
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a conflicted populated submodule with modifications fails unless forced' '
|
|
|
|
|
git checkout conflict1 &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo X >submod/empty &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git merge conflict2 &&
|
|
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect.conflict actual &&
|
|
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.url &&
|
|
|
|
|
test_must_fail git config -f .gitmodules submodule.sub.path
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a conflicted populated submodule with untracked files fails unless forced' '
|
|
|
|
|
git checkout conflict1 &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo X >submod/untracked &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git merge conflict2 &&
|
|
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect.conflict actual &&
|
|
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a conflicted populated submodule with a .git directory fails even when forced' '
|
|
|
|
|
git checkout conflict1 &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
(cd submod &&
|
|
|
|
|
rm .git &&
|
2012-12-19 03:47:50 +01:00
|
|
|
cp -R ../.git/modules/sub .git &&
|
2012-09-26 20:21:13 +02:00
|
|
|
GIT_WORK_TREE=. git config --unset core.worktree
|
|
|
|
|
) &&
|
|
|
|
|
test_must_fail git merge conflict2 &&
|
|
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -d submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect.conflict actual &&
|
|
|
|
|
test_must_fail git rm -f submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -d submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect.conflict actual &&
|
|
|
|
|
git merge --abort &&
|
|
|
|
|
rm -rf submod
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
|
|
|
|
|
git checkout conflict1 &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
test_must_fail git merge conflict2 &&
|
|
|
|
|
git rm submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2016-12-27 20:03:14 +01:00
|
|
|
test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' '
|
2012-09-26 20:21:13 +02:00
|
|
|
git checkout -f master &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
(cd submod &&
|
|
|
|
|
rm .git &&
|
2012-12-19 03:47:50 +01:00
|
|
|
cp -R ../.git/modules/sub .git &&
|
2016-12-27 20:03:14 +01:00
|
|
|
GIT_WORK_TREE=. git config --unset core.worktree &&
|
|
|
|
|
rm -r ../.git/modules/sub
|
2012-09-26 20:21:13 +02:00
|
|
|
) &&
|
2016-12-27 20:03:14 +01:00
|
|
|
git rm submod 2>output.err &&
|
|
|
|
|
! test -d submod &&
|
|
|
|
|
! test -d submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2016-12-27 20:03:14 +01:00
|
|
|
test -s actual &&
|
|
|
|
|
test_i18ngrep Migrating output.err
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
cat >expect.deepmodified <<EOF
|
|
|
|
|
M submod/subsubmod
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup subsubmodule' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update &&
|
|
|
|
|
(cd submod &&
|
|
|
|
|
git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
|
|
|
|
|
git config -f .gitmodules submodule.sub.url ../. &&
|
|
|
|
|
git config -f .gitmodules submodule.sub.path subsubmod &&
|
|
|
|
|
git submodule init &&
|
|
|
|
|
git add .gitmodules &&
|
|
|
|
|
git commit -m "add subsubmodule" &&
|
|
|
|
|
git submodule update subsubmod
|
|
|
|
|
) &&
|
|
|
|
|
git commit -a -m "added deep submodule"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm recursively removes work tree of unmodified submodules' '
|
|
|
|
|
git rm submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a populated nested submodule with different nested HEAD fails unless forced' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update --recursive &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git -C submod/subsubmod checkout HEAD^ &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
short status: improve reporting for submodule changes
If I add an untracked file to a submodule or modify a tracked file,
currently "git status --short" treats the change in the same way as
changes to the current HEAD of the submodule:
$ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit
$ echo hello >gerrit/plugins/replication/stray-file
$ sed -i -e 's/.*//' gerrit/plugins/replication/.mailmap
$ git -C gerrit status --short
M plugins/replication
This is by analogy with ordinary files, where "M" represents a change
that has not been added yet to the index. But this change cannot be
added to the index without entering the submodule, "git add"-ing it,
and running "git commit", so the analogy is counterproductive.
Introduce new status letters " ?" and " m" for this. These are similar
to the existing "??" and " M" but mean that the submodule (not the
parent project) has new untracked files and modified files, respectively.
The user can use "git add" and "git commit" from within the submodule to
add them.
Changes to the submodule's HEAD commit can be recorded in the index with
a plain "git add -u" and are shown with " M", like today.
To avoid excessive clutter, show at most one of " ?", " m", and " M" for
the submodule. They represent increasing levels of change --- the last
one that applies is shown (e.g., " m" if there are both modified files
and untracked files in the submodule, or " M" if the submodule's HEAD
has been modified and it has untracked files).
While making these changes, we need to make sure to not break porcelain
level 1, which shares code with "status --short". We only change
"git status --short".
Non-short "git status" and "git status --porcelain=2" already handle
these cases by showing more detail:
$ git -C gerrit status --porcelain=2
1 .M S.MU 160000 160000 160000 305c864db28eb0c77c8499bc04c87de3f849cf3c 305c864db28eb0c77c8499bc04c87de3f849cf3c plugins/replication
$ git -C gerrit status
[...]
modified: plugins/replication (modified content, untracked content)
Scripts caring about these distinctions should use --porcelain=2.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-30 00:26:15 +02:00
|
|
|
test_cmp expect.modified_inside actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a populated nested submodule with nested modifications fails unless forced' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update --recursive &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo X >submod/subsubmod/empty &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
short status: improve reporting for submodule changes
If I add an untracked file to a submodule or modify a tracked file,
currently "git status --short" treats the change in the same way as
changes to the current HEAD of the submodule:
$ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit
$ echo hello >gerrit/plugins/replication/stray-file
$ sed -i -e 's/.*//' gerrit/plugins/replication/.mailmap
$ git -C gerrit status --short
M plugins/replication
This is by analogy with ordinary files, where "M" represents a change
that has not been added yet to the index. But this change cannot be
added to the index without entering the submodule, "git add"-ing it,
and running "git commit", so the analogy is counterproductive.
Introduce new status letters " ?" and " m" for this. These are similar
to the existing "??" and " M" but mean that the submodule (not the
parent project) has new untracked files and modified files, respectively.
The user can use "git add" and "git commit" from within the submodule to
add them.
Changes to the submodule's HEAD commit can be recorded in the index with
a plain "git add -u" and are shown with " M", like today.
To avoid excessive clutter, show at most one of " ?", " m", and " M" for
the submodule. They represent increasing levels of change --- the last
one that applies is shown (e.g., " m" if there are both modified files
and untracked files in the submodule, or " M" if the submodule's HEAD
has been modified and it has untracked files).
While making these changes, we need to make sure to not break porcelain
level 1, which shares code with "status --short". We only change
"git status --short".
Non-short "git status" and "git status --porcelain=2" already handle
these cases by showing more detail:
$ git -C gerrit status --porcelain=2
1 .M S.MU 160000 160000 160000 305c864db28eb0c77c8499bc04c87de3f849cf3c 305c864db28eb0c77c8499bc04c87de3f849cf3c plugins/replication
$ git -C gerrit status
[...]
modified: plugins/replication (modified content, untracked content)
Scripts caring about these distinctions should use --porcelain=2.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-30 00:26:15 +02:00
|
|
|
test_cmp expect.modified_inside actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm of a populated nested submodule with nested untracked files fails unless forced' '
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update --recursive &&
|
2016-12-13 00:54:55 +01:00
|
|
|
echo X >submod/subsubmod/untracked &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_must_fail git rm submod &&
|
|
|
|
|
test -d submod &&
|
|
|
|
|
test -f submod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2017-03-30 00:26:16 +02:00
|
|
|
test_cmp expect.modified_untracked actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
git rm -f submod &&
|
|
|
|
|
test ! -d submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2012-09-26 20:21:13 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2017-03-21 22:08:02 +01:00
|
|
|
test_expect_success "rm absorbs submodule's nested .git directory" '
|
2012-09-26 20:21:13 +02:00
|
|
|
git reset --hard &&
|
|
|
|
|
git submodule update --recursive &&
|
|
|
|
|
(cd submod/subsubmod &&
|
|
|
|
|
rm .git &&
|
2016-12-27 20:03:14 +01:00
|
|
|
mv ../../.git/modules/sub/modules/sub .git &&
|
2012-09-26 20:21:13 +02:00
|
|
|
GIT_WORK_TREE=. git config --unset core.worktree
|
|
|
|
|
) &&
|
2016-12-27 20:03:14 +01:00
|
|
|
git rm submod 2>output.err &&
|
|
|
|
|
! test -d submod &&
|
|
|
|
|
! test -d submod/subsubmod/.git &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2016-12-27 20:03:14 +01:00
|
|
|
test -s actual &&
|
|
|
|
|
test_i18ngrep Migrating output.err
|
2012-09-26 20:21:13 +02:00
|
|
|
'
|
|
|
|
|
|
2014-01-07 22:32:37 +01:00
|
|
|
test_expect_success 'checking out a commit after submodule removal needs manual updates' '
|
2016-12-27 20:03:14 +01:00
|
|
|
git commit -m "submodule removal" submod .gitmodules &&
|
2014-01-07 22:32:37 +01:00
|
|
|
git checkout HEAD^ &&
|
|
|
|
|
git submodule update &&
|
2016-12-02 21:05:15 +01:00
|
|
|
git checkout -q HEAD^ &&
|
2014-01-07 22:32:37 +01:00
|
|
|
git checkout -q master 2>actual &&
|
2017-11-01 15:44:44 +01:00
|
|
|
test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
|
2014-01-07 22:32:37 +01:00
|
|
|
git status -s submod >actual &&
|
|
|
|
|
echo "?? submod/" >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
rm -rf submod &&
|
2016-12-13 00:54:55 +01:00
|
|
|
git status -s -uno --ignore-submodules=none >actual &&
|
2018-08-19 23:57:22 +02:00
|
|
|
test_must_be_empty actual
|
2014-01-07 22:32:37 +01:00
|
|
|
'
|
|
|
|
|
|
2013-04-04 21:03:35 +02:00
|
|
|
test_expect_success 'rm of d/f when d has become a non-directory' '
|
|
|
|
|
rm -rf d &&
|
|
|
|
|
mkdir d &&
|
|
|
|
|
>d/f &&
|
|
|
|
|
git add d &&
|
|
|
|
|
rm -rf d &&
|
|
|
|
|
>d &&
|
|
|
|
|
git rm d/f &&
|
|
|
|
|
test_must_fail git rev-parse --verify :d/f &&
|
|
|
|
|
test_path_is_file d
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'rm of d/f when d has become a dangling symlink' '
|
|
|
|
|
rm -rf d &&
|
|
|
|
|
mkdir d &&
|
|
|
|
|
>d/f &&
|
|
|
|
|
git add d &&
|
|
|
|
|
rm -rf d &&
|
|
|
|
|
ln -s nonexistent d &&
|
|
|
|
|
git rm d/f &&
|
|
|
|
|
test_must_fail git rev-parse --verify :d/f &&
|
|
|
|
|
test -h d &&
|
|
|
|
|
test_path_is_missing d
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-04 21:03:58 +02:00
|
|
|
test_expect_success 'rm of file when it has become a directory' '
|
|
|
|
|
rm -rf d &&
|
|
|
|
|
>d &&
|
|
|
|
|
git add d &&
|
|
|
|
|
rm -f d &&
|
|
|
|
|
mkdir d &&
|
|
|
|
|
>d/f &&
|
|
|
|
|
test_must_fail git rm d &&
|
|
|
|
|
git rev-parse --verify :d &&
|
|
|
|
|
test_path_is_file d/f
|
|
|
|
|
'
|
|
|
|
|
|
t3600: document failure of rm across symbolic links
If we have a symlink "d" that points to a directory, we
should not be able to remove "d/f". In the normal case,
where "d/f" does not exist in the index, we already disallow
this, as we only remove things that git knows about in the
index. So for something like:
ln -s /outside/repo foo
git add foo
git rm foo/bar
we will properly produce an error (as there is no index
entry for foo/bar). However, if there is an index entry for
the path (e.g., because the movement is due to working tree
changes that have not yet been reflected in the index), we
will happily delete it, even though the path we delete from the
filesystem is not the same as the path in the index.
This patch documents that failure with a test.
While this is a bug, it should not be possible to cause
serious data loss with it. For any path that does not have
an index entry, we will complain and bail. For a path which
does have an index entry, we will do the usual up-to-date
content check. So even if the deleted path in the filesystem
is not the same as the one we are removing from the index,
we do know that they at least have the same content, and
that the content is included in HEAD.
That means the worst case is not the accidental loss of
content, but rather confusion by the user when a copy of a
file another part of the tree is removed. Which makes this
bug a minor and hard-to-trigger annoyance rather than a
data-loss bug (and hence the fix can be saved for a rainy
day when somebody feels like working on it).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-05 02:00:09 +02:00
|
|
|
test_expect_success SYMLINKS 'rm across a symlinked leading path (no index)' '
|
|
|
|
|
rm -rf d e &&
|
|
|
|
|
mkdir e &&
|
|
|
|
|
echo content >e/f &&
|
|
|
|
|
ln -s e d &&
|
|
|
|
|
git add -A e d &&
|
|
|
|
|
git commit -m "symlink d to e, e/f exists" &&
|
|
|
|
|
test_must_fail git rm d/f &&
|
|
|
|
|
git rev-parse --verify :d &&
|
|
|
|
|
git rev-parse --verify :e/f &&
|
|
|
|
|
test -h d &&
|
|
|
|
|
test_path_is_file e/f
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_failure SYMLINKS 'rm across a symlinked leading path (w/ index)' '
|
|
|
|
|
rm -rf d e &&
|
|
|
|
|
mkdir d &&
|
|
|
|
|
echo content >d/f &&
|
|
|
|
|
git add -A e d &&
|
|
|
|
|
git commit -m "d/f exists" &&
|
|
|
|
|
mv d e &&
|
|
|
|
|
ln -s e d &&
|
|
|
|
|
test_must_fail git rm d/f &&
|
|
|
|
|
git rev-parse --verify :d/f &&
|
|
|
|
|
test -h d &&
|
|
|
|
|
test_path_is_file e/f
|
|
|
|
|
'
|
|
|
|
|
|
2013-06-12 10:06:43 +02:00
|
|
|
test_expect_success 'setup for testing rm messages' '
|
|
|
|
|
>bar.txt &&
|
|
|
|
|
>foo.txt &&
|
|
|
|
|
git add bar.txt foo.txt
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rm files with different staged content' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following files have staged content different from both the
|
|
|
|
|
file and the HEAD:
|
|
|
|
|
bar.txt
|
|
|
|
|
foo.txt
|
|
|
|
|
(use -f to force removal)
|
|
|
|
|
EOF
|
|
|
|
|
echo content1 >foo.txt &&
|
|
|
|
|
echo content1 >bar.txt &&
|
|
|
|
|
test_must_fail git rm foo.txt bar.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-06-12 10:06:44 +02:00
|
|
|
test_expect_success 'rm files with different staged content without hints' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following files have staged content different from both the
|
|
|
|
|
file and the HEAD:
|
|
|
|
|
bar.txt
|
|
|
|
|
foo.txt
|
|
|
|
|
EOF
|
|
|
|
|
echo content2 >foo.txt &&
|
|
|
|
|
echo content2 >bar.txt &&
|
|
|
|
|
test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
2013-06-12 10:06:43 +02:00
|
|
|
|
|
|
|
|
test_expect_success 'rm file with local modification' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following file has local modifications:
|
|
|
|
|
foo.txt
|
|
|
|
|
(use --cached to keep the file, or -f to force removal)
|
|
|
|
|
EOF
|
|
|
|
|
git commit -m "testing rm 3" &&
|
|
|
|
|
echo content3 >foo.txt &&
|
|
|
|
|
test_must_fail git rm foo.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-06-12 10:06:44 +02:00
|
|
|
test_expect_success 'rm file with local modification without hints' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following file has local modifications:
|
|
|
|
|
bar.txt
|
|
|
|
|
EOF
|
|
|
|
|
echo content4 >bar.txt &&
|
|
|
|
|
test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
2013-06-12 10:06:43 +02:00
|
|
|
|
|
|
|
|
test_expect_success 'rm file with changes in the index' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following file has changes staged in the index:
|
|
|
|
|
foo.txt
|
|
|
|
|
(use --cached to keep the file, or -f to force removal)
|
|
|
|
|
EOF
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
echo content5 >foo.txt &&
|
|
|
|
|
git add foo.txt &&
|
|
|
|
|
test_must_fail git rm foo.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-06-12 10:06:44 +02:00
|
|
|
test_expect_success 'rm file with changes in the index without hints' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following file has changes staged in the index:
|
|
|
|
|
foo.txt
|
|
|
|
|
EOF
|
|
|
|
|
test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
2013-06-12 10:06:43 +02:00
|
|
|
|
|
|
|
|
test_expect_success 'rm files with two different errors' '
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
error: the following file has staged content different from both the
|
|
|
|
|
file and the HEAD:
|
|
|
|
|
foo1.txt
|
|
|
|
|
(use -f to force removal)
|
|
|
|
|
error: the following file has changes staged in the index:
|
|
|
|
|
bar1.txt
|
|
|
|
|
(use --cached to keep the file, or -f to force removal)
|
|
|
|
|
EOF
|
|
|
|
|
echo content >foo1.txt &&
|
|
|
|
|
git add foo1.txt &&
|
|
|
|
|
echo content6 >foo1.txt &&
|
|
|
|
|
echo content6 >bar1.txt &&
|
|
|
|
|
git add bar1.txt &&
|
|
|
|
|
test_must_fail git rm bar1.txt foo1.txt 2>actual &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2017-06-07 05:33:08 +02:00
|
|
|
test_expect_success 'rm empty string should fail' '
|
|
|
|
|
test_must_fail git rm -rf ""
|
2016-06-23 01:00:24 +02:00
|
|
|
'
|
|
|
|
|
|
2006-02-22 00:04:51 +01:00
|
|
|
test_done
|