summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 19:19:37 +0700
committerJunio C Hamano <gitster@pobox.com>2014-06-13 11:49:40 -0700
commite0cf0d7de28ee90e1668049e32802a8dbbcc2950 (patch)
tree2591f7dcfda241bdd06d96e1ecebc4b0ea88d30a
parent5fc2fc8fa22312efca46ed5321fa1d3b4d537a72 (diff)
downloadgit-e0cf0d7de28ee90e1668049e32802a8dbbcc2950.tar.gz
read-cache: mark new entries for split index
Make sure entry addition does not lead to unifying the index. We don't need to explicitly keep track of new entries. If ce->index is zero, they're new. Otherwise it's unlikely that they are new, but we'll do a thorough check later at writing time. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--read-cache.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index 90a3f09db9..52a27b30a4 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -38,7 +38,8 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
#define CACHE_EXT_LINK 0x6c696e6b /* "link" */
/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
-#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED)
+#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
+ CE_ENTRY_ADDED)
struct index_state the_index;
static const char *alternate_index_output;