diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-03 00:38:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-03 00:38:12 -0800 |
| commit | ae26e7c74970281bd3597c79e44a8b54a927bbe1 (patch) | |
| tree | ab91c9e9de975fd469f81795a5f53026050b2b71 /t/t3600-rm.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | git add --intent-to-add: do not let an empty blob be committed by accident (diff) | |
| download | tgif-ae26e7c74970281bd3597c79e44a8b54a927bbe1.tar.xz | |
Merge branch 'jc/rm-i-t-a'
* jc/rm-i-t-a:
git add --intent-to-add: do not let an empty blob be committed by accident
git add --intent-to-add: fix removal of cached emptiness
builtin-rm.c: explain and clarify the "local change" logic
Extend index to save more flags
Diffstat (limited to 't/t3600-rm.sh')
| -rwxr-xr-x | t/t3600-rm.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 5b4d6f7138..b7d46e50a8 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -187,8 +187,8 @@ test_expect_success 'but with -f it should work.' ' test_must_fail git ls-files --error-unmatch baz ' -test_expect_failure 'refuse to remove cached empty file with modifications' ' - touch empty && +test_expect_success 'refuse to remove cached empty file with modifications' ' + >empty && git add empty && echo content >empty && test_must_fail git rm --cached empty |