cache-tree: allow writing in-memory index as tree

The function `write_in_core_index_as_tree()` takes a repository and
writes its index into a tree object. What this function cannot do though
is to take an _arbitrary_ in-memory index.

Introduce a new `struct index_state` parameter so that the caller can
pass a different index than the one belonging to the repository. This
will be used in a subsequent commit.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index d325083ff3d7df4adec9a378d89bf33e17e4cfda..aa00f0f483e781861f4fcaa6030d47effccc75d3 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -902,7 +902,8 @@ static int merge_working_tree(const struct checkout_opts *opts,
                                           0);
                        init_ui_merge_options(&o, the_repository);
                        o.verbosity = 0;
-                       work = write_in_core_index_as_tree(the_repository);
+                       work = write_in_core_index_as_tree(the_repository,
+                                                          the_repository->index);
 
                        ret = reset_tree(new_tree,
                                         opts, 1,

diff --git a/cache-tree.c b/cache-tree.c
index 2d8947b51878407200236f0d0e894645f69934ea..2976092270a2b502bea5f4872df28945cb4f3e5a 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -723,11 +723,11 @@ static int write_index_as_tree_internal(struct object_id *oid,
        return 0;
 }
 
-struct tree* write_in_core_index_as_tree(struct repository *repo) {
+struct tree *write_in_core_index_as_tree(struct repository *repo,
+                                        struct index_state *index_state) {
        struct object_id o;
        int was_valid, ret;
 
-       struct index_state *index_state = repo->index;
        was_valid = index_state->cache_tree &&
                    cache_tree_fully_valid(index_state->cache_tree);
 

diff --git a/cache-tree.h b/cache-tree.h
index b82c4963e7c805ffd03adbb96407f5e39a0a8d4c..f8bddae5235f5474410e4e80cb0bfa9408353bfc 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -47,7 +47,8 @@ int cache_tree_verify(struct repository *, struct index_state *);
 #define WRITE_TREE_UNMERGED_INDEX (-2)
 #define WRITE_TREE_PREFIX_ERROR (-3)
 
-struct tree* write_in_core_index_as_tree(struct repository *repo);
+struct tree *write_in_core_index_as_tree(struct repository *repo,
+                                        struct index_state *index_state);
 int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
 void prime_cache_tree(struct repository *, struct index_state *, struct tree *);