summaryrefslogtreecommitdiff
path: root/builtin/rm.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-22 21:10:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-22 21:10:21 (GMT)
commit2bbea5c8f2242ee798e9bee525b485994a8e5911 (patch)
tree87e64824719bf59565685d3c3db09ea9ce31a248 /builtin/rm.c
parent47847c756b7de9615cf89f353d3d2a84f8a871f1 (diff)
parent4d552005323034c1d6311796ac1074e9a4b4b57e (diff)
downloadgit-2bbea5c8f2242ee798e9bee525b485994a8e5911.zip
git-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.gz
git-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.bz2
Merge branch 'nd/ita-cleanup' into maint
Paths that have been told the index about with "add -N" are not quite yet in the index, but a few commands behaved as if they already are in a harmful way. * nd/ita-cleanup: grep: make it clear i-t-a entries are ignored add and use a convenience macro ce_intent_to_add() blame: remove obsolete comment
Diffstat (limited to 'builtin/rm.c')
-rw-r--r--builtin/rm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c
index 80b972f..8829b09 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -211,7 +211,7 @@ static int check_local_mod(unsigned char *head, int index_only)
* "intent to add" entry.
*/
if (local_changes && staged_changes) {
- if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
+ if (!index_only || !ce_intent_to_add(ce))
string_list_append(&files_staged, name);
}
else if (!index_only) {