diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-28 19:55:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-28 19:58:24 -0800 |
| commit | 388b2acd6e649145d4368a10cf4df5f5bbbac2c2 (patch) | |
| tree | 2981eb9ed66bb9841ac7fae18022326ddda48018 /t | |
| parent | 69530cb0c0d5f08dac9bedff56c164b7370f9931 (diff) | |
| download | git-388b2acd6e649145d4368a10cf4df5f5bbbac2c2.tar.gz git-388b2acd6e649145d4368a10cf4df5f5bbbac2c2.tar.xz | |
git add --intent-to-add: fix removal of cached emptiness
This uses the extended index flag mechanism introduced earlier to mark
the entries added to the index via "git add -N" with CE_INTENT_TO_ADD.
The logic to detect an "intent to add" entry for the purpose of allowing
"git rm --cached $path" is tightened to check not just for a staged empty
blob, but with the CE_INTENT_TO_ADD bit. This protects an empty blob that
was explicitly added and then modified in the work tree from being dropped
with this sequence:
$ >empty
$ git add empty
$ echo "non empty" >empty
$ git rm --cached empty
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -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 5b4d6f713..b7d46e50a 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 |