Merge branch 'ab/detox-gettext-tests'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 264d494a64cda67f59ec34002b5cacab51c29ddf..d2332d3e1787126f50f3e5f01652c00911c8eda9 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -679,9 +679,6 @@ static int do_recursive_merge(struct repository *r,
 
 static struct object_id *get_cache_tree_oid(struct index_state *istate)
 {
-       if (!istate->cache_tree)
-               istate->cache_tree = cache_tree();
-
        if (!cache_tree_fully_valid(istate->cache_tree))
                if (cache_tree_update(istate, 0)) {
                        error(_("unable to update cache tree"));