Elijah Newren wrote:
> --- a/t/t3600-rm.sh
> +++ b/t/t3600-rm.sh
> @@ -38,37 +38,33 @@ test_expect_success \
[...]
> test_expect_success \
> 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
> - echo content > foo
> - git add foo
> - git commit -m foo
> + git checkout HEAD -- foo &&
[...]
Why not
- echo content > foo
- git add foo
- git commit -m foo
+ echo content > foo &&
+ git add foo &&
+ git commit --allow-empty -m foo &&
?
Likewise for the next case. Though in the long run, a helper function
to prepare the HEAD, index, and work tree would probably be the way to
go for this test.
With the change below (or whatever else is deemed appropriate),
Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Sorry to draw this out so.
---
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 9660ae0..53add72 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -46,13 +46,15 @@ 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 &&
+ git commit --allow-empty -m foo &&
echo "other content" > foo &&
git rm --cached foo'
test_expect_success \
'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
- git checkout HEAD -- foo &&
+ echo content > foo &&
+ git add foo &&
+ git commit --allow-empty -m foo &&
echo "other content" > foo &&
git add foo &&
echo "yet another content" > foo &&
@@ -61,7 +63,9 @@ test_expect_success \
test_expect_success \
'Test that git rm --cached -f foo works in case where --cached only did not' \
- 'git checkout HEAD -- foo &&
+ 'echo content > foo &&
+ git add foo &&
+ git commit --allow-empty -m foo &&
echo "other content" > foo &&
git add foo &&
echo "yet another content" > foo &&
--
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html