summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-03 09:34:00 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-03 09:34:00 -0700
commit97fefaf6d32d3e8dbb78778f62fcdd980dcf46c7 (patch)
tree410a80ba3143ff806a0bfbba469b42a5950a0e18 /cache.h
parent961c5129d53554d4d71003899fab8dda846d7c2a (diff)
parente721c1544f9166e8f08a7f8c0e6178ea3a45e255 (diff)
downloadgit-97fefaf6d32d3e8dbb78778f62fcdd980dcf46c7.tar.gz
Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'
Consolidate repeated pathspec matches on the same paths, while fixing a bug in "git checkout dir/" code started from an unmerged index. * nd/checkout-paths-reduce-match-pathspec-calls: checkout: avoid unnecessary match_pathspec calls
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index ec2fd7a304..c12957bb03 100644
--- a/cache.h
+++ b/cache.h
@@ -162,6 +162,9 @@ struct cache_entry {
#define CE_UNPACKED (1 << 24)
#define CE_NEW_SKIP_WORKTREE (1 << 25)
+/* used to temporarily mark paths matched by pathspecs */
+#define CE_MATCHED (1 << 26)
+
/*
* Extended on-disk flags
*/