merge-recursive: Avoid working directory changes during recursive case

diff --git a/merge-recursive.c b/merge-recursive.c
index f172df1695f0c1a06b205fb43295a58192dcd33a..e6a6a81ec28b531031aa50ee5374a05c0a890137 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -353,6 +353,13 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
        int last_len = 0;
        int i;
 
+       /*
+        * If we're merging merge-bases, we don't want to bother with
+        * any working directory changes.
+        */
+       if (o->call_depth)
+               return;
+
        for (i = 0; i < entries->nr; i++) {
                const char *path = entries->items[i].string;
                int len = strlen(path);