summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-06-27 16:21:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-01 05:45:51 (GMT)
commite46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85 (patch)
treeed37667a4a0f83d46f4403d0c5d28542e4c3f244 /read-cache.c
parentb2eabcc2539c021ea6cb2d1d2d28c8213986a186 (diff)
downloadgit-e46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85.zip
git-e46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85.tar.gz
git-e46bbcf6e89e4b1d3d8de1d20d836538ab0f0c85.tar.bz2
Move read_cache_unmerged() to read-cache.c
builtin-read-tree has a read_cache_unmerged() which is useful for other builtins, for example builtin-merge uses it as well. Move it to read-cache.c to avoid code duplication. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index f83de8c..d801f9d 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1410,3 +1410,34 @@ int write_index(const struct index_state *istate, int newfd)
}
return ce_flush(&c, newfd);
}
+
+/*
+ * Read the index file that is potentially unmerged into given
+ * index_state, dropping any unmerged entries. Returns true is
+ * the index is unmerged. Callers who want to refuse to work
+ * from an unmerged state can call this and check its return value,
+ * instead of calling read_cache().
+ */
+int read_index_unmerged(struct index_state *istate)
+{
+ int i;
+ struct cache_entry **dst;
+ struct cache_entry *last = NULL;
+
+ read_index(istate);
+ dst = istate->cache;
+ for (i = 0; i < istate->cache_nr; i++) {
+ struct cache_entry *ce = istate->cache[i];
+ if (ce_stage(ce)) {
+ remove_name_hash(ce);
+ if (last && !strcmp(ce->name, last->name))
+ continue;
+ cache_tree_invalidate_path(istate->cache_tree, ce->name);
+ last = ce;
+ continue;
+ }
+ *dst++ = ce;
+ }
+ istate->cache_nr = dst - istate->cache;
+ return !!last;
+}