t3418: non-interactive rebase --continue with rerere enabled

diff --git a/read-cache.c b/read-cache.c
index 5dee4e2b7f20b5b2ddece63c753af4011a0a71e5..89dbc0837a4155f9e70b56c7d61c8742482f3659 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -999,7 +999,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
        }
        pos = -pos-1;
 
-       untracked_cache_add_to_index(istate, ce->name);
+       if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
+               untracked_cache_add_to_index(istate, ce->name);
 
        /*
         * Inserting a merged entry ("stage 0") into the index