mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/ita-cleanup'

Browse Source 
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:
Junio C Hamano
2016-01-20 11:43:25 -08:00
parent 7a450b48e7 4d55200532
commit cc14ea8cf4
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
read-cache.c
View File

@ -327,7 +327,7 @@ int ie_match_stat(const struct index_state *istate,
* by definition never matches what is in the work tree until it
* actually gets added.
*/
if (ce->ce_flags & CE_INTENT_TO_ADD)
if (ce_intent_to_add(ce))
return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
changed = ce_match_stat_basic(ce, st);
@ -1237,7 +1237,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
if (cache_errno == ENOENT)
fmt = deleted_fmt;
else if (ce->ce_flags & CE_INTENT_TO_ADD)
else if (ce_intent_to_add(ce))
fmt = added_fmt; /* must be before other checks */
else if (changed & TYPE_CHANGED)
fmt = typechange_fmt;