summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-20 11:43:25 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-20 11:43:25 -0800
commitcc14ea8cf4520a9607fba4b1fbacea7fa9723c73 (patch)
treef5a5fb76eba752964fa48622cbce21f3b796f7f5 /cache.h
parent7a450b48e765e957762b015f30c89f21b1028771 (diff)
parent4d552005323034c1d6311796ac1074e9a4b4b57e (diff)
downloadgit-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.tar.gz
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 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index bf00ce55f8..dcd654ffde 100644
--- a/cache.h
+++ b/cache.h
@@ -260,6 +260,7 @@ static inline unsigned create_ce_flags(unsigned stage)
#define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE)
#define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE)
#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)
static inline unsigned int create_ce_mode(unsigned int mode)