Commit 895ff3b2 authored by Duy Nguyen's avatar Duy Nguyen Committed by Junio C Hamano

add and use a convenience macro ce_intent_to_add()

Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent a62bc310
...@@ -212,7 +212,7 @@ static int check_local_mod(unsigned char *head, int index_only) ...@@ -212,7 +212,7 @@ static int check_local_mod(unsigned char *head, int index_only)
* "intent to add" entry. * "intent to add" entry.
*/ */
if (local_changes && staged_changes) { 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); string_list_append(&files_staged, name);
} }
else if (!index_only) { else if (!index_only) {
......
...@@ -377,7 +377,7 @@ static int update_one(struct cache_tree *it, ...@@ -377,7 +377,7 @@ static int update_one(struct cache_tree *it,
* they are not part of generated trees. Invalidate up * they are not part of generated trees. Invalidate up
* to root to force cache-tree users to read elsewhere. * 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; to_invalidate = 1;
continue; continue;
} }
......
...@@ -233,6 +233,7 @@ static inline unsigned create_ce_flags(unsigned stage) ...@@ -233,6 +233,7 @@ static inline unsigned create_ce_flags(unsigned stage)
#define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE) #define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE)
#define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE) #define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE)
#define ce_mark_uptodate(ce) ((ce)->ce_flags |= CE_UPTODATE) #define ce_mark_uptodate(ce) ((ce)->ce_flags |= CE_UPTODATE)
#define ce_intent_to_add(ce) ((ce)->ce_flags & CE_INTENT_TO_ADD)
#define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644) #define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644)
static inline unsigned int create_ce_mode(unsigned int mode) static inline unsigned int create_ce_mode(unsigned int mode)
......
...@@ -311,7 +311,7 @@ int ie_match_stat(const struct index_state *istate, ...@@ -311,7 +311,7 @@ int ie_match_stat(const struct index_state *istate,
* by definition never matches what is in the work tree until it * by definition never matches what is in the work tree until it
* actually gets added. * actually gets added.
*/ */
if (ce->ce_flags & CE_INTENT_TO_ADD) if (ce_intent_to_add(ce))
return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
changed = ce_match_stat_basic(ce, st); changed = ce_match_stat_basic(ce, st);
...@@ -1231,7 +1231,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, ...@@ -1231,7 +1231,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
if (cache_errno == ENOENT) if (cache_errno == ENOENT)
fmt = deleted_fmt; 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 */ fmt = added_fmt; /* must be before other checks */
else if (changed & TYPE_CHANGED) else if (changed & TYPE_CHANGED)
fmt = typechange_fmt; fmt = typechange_fmt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment