summaryrefslogtreecommitdiff
path: root/builtin/rm.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-20 19:43:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-20 19:43:25 (GMT)
commitcc14ea8cf4520a9607fba4b1fbacea7fa9723c73 (patch)
treef5a5fb76eba752964fa48622cbce21f3b796f7f5 /builtin/rm.c
parent7a450b48e765e957762b015f30c89f21b1028771 (diff)
parent4d552005323034c1d6311796ac1074e9a4b4b57e (diff)
downloadgit-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.zip
git-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.tar.gz
git-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.tar.bz2
Merge branch 'nd/ita-cleanup'
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) {