[PATCH 2/3] git add --intent-to-add: fix removal of cached emptiness
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 29, 2008, 03:55 UTC
- Message-ID
- <7vprkf2nki.fsf_-_@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vvdu72nq9.fsf@gitster.siamese.dyndns.org>
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> --- builtin-rm.c | 2 +- cache.h | 3 ++- read-cache.c | 2 ++ t/t3600-rm.sh | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/builtin-rm.c b/builtin-rm.c index 3d03da0..c11f455 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); diff --git a/cache.h b/cache.h index ef2e7f9..f15b3fc 100644 --- a/cache.h +++ b/cache.h @@ -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 abc627b..fa30a0f 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 5b4d6f7..b7d46e5 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
-- 1.6.0.4.850.g6bd829