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 | |
| 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>
| -rw-r--r-- | builtin-rm.c | 2 | ||||
| -rw-r--r-- | cache.h | 3 | ||||
| -rw-r--r-- | read-cache.c | 2 | ||||
| -rwxr-xr-x | t/t3600-rm.sh | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index 3d03da09d..c11f45585 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -115,7 +115,7 @@ static int check_local_mod(unsigned char *head, int index_only) * "intent to add" entry. */ if (local_changes && staged_changes) { - if (!index_only || !is_empty_blob_sha1(ce->sha1)) + if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD)) errs = error("'%s' has staged content different " "from both the file and the HEAD\n" "(use -f to force removal)", name); @@ -176,10 +176,11 @@ struct cache_entry { /* * Extended on-disk flags */ +#define CE_INTENT_TO_ADD 0x20000000 /* CE_EXTENDED2 is for future extension */ #define CE_EXTENDED2 0x80000000 -#define CE_EXTENDED_FLAGS (0) +#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD) /* * Safeguard to avoid saving wrong flags: diff --git a/read-cache.c b/read-cache.c index abc627ba0..fa30a0f88 100644 --- a/read-cache.c +++ b/read-cache.c @@ -546,6 +546,8 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, ce->ce_flags = namelen; if (!intent_only) fill_stat_cache_info(ce, st); + else + ce->ce_flags |= CE_INTENT_TO_ADD; if (trust_executable_bit && has_symlinks) ce->ce_mode = create_ce_mode(st_mode); 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 |