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
This commit is contained in:
@ -377,7 +377,7 @@ static int update_one(struct cache_tree *it,
|
||||
* they are not part of generated trees. Invalidate up
|
||||
* to root to force cache-tree users to read elsewhere.
|
||||
*/
|
||||
if (ce->ce_flags & CE_INTENT_TO_ADD) {
|
||||
if (ce_intent_to_add(ce)) {
|
||||
to_invalidate = 1;
|
||||
continue;
|
||||
}
|
||||
|
Reference in New Issue
Block a user