summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-29 03:55:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-29 03:58:24 (GMT)
commit388b2acd6e649145d4368a10cf4df5f5bbbac2c2 (patch)
tree2981eb9ed66bb9841ac7fae18022326ddda48018 /pretty.c
parent69530cb0c0d5f08dac9bedff56c164b7370f9931 (diff)
downloadgit-388b2acd6e649145d4368a10cf4df5f5bbbac2c2.zip
git-388b2acd6e649145d4368a10cf4df5f5bbbac2c2.tar.gz
git-388b2acd6e649145d4368a10cf4df5f5bbbac2c2.tar.bz2
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 'pretty.c')
0 files changed, 0 insertions, 0 deletions