pull: introduce a pull.rebase option to enable --rebase

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 07ad1a3be4432928872c05859e0fffda026c502f..db9ba19ddf94fec3a5cfff450b35f5bb7b46c35e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -341,11 +341,10 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
         * make room for the corresponding directory.  Such paths will
         * later be processed in process_df_entry() at the end.  If
         * the corresponding directory ends up being removed by the
-        * merge, then the file will be reinstated at that time
-        * (albeit with a different timestamp!); otherwise, if the
-        * file is not supposed to be removed by the merge, the
-        * contents of the file will be placed in another unique
-        * filename.
+        * merge, then the file will be reinstated at that time;
+        * otherwise, if the file is not supposed to be removed by the
+        * merge, the contents of the file will be placed in another
+        * unique filename.
         *
         * NOTE: This function relies on the fact that entries for a
         * D/F conflict will appear adjacent in the index, with the
@@ -356,13 +355,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
        int last_len = 0;
        int i;
 
-       /*
-        * Do not do any of this crazyness during the recursive; we don't
-        * even write anything to the working tree!
-        */
-       if (o->call_depth)
-               return;
-
        for (i = 0; i < entries->nr; i++) {
                const char *path = entries->items[i].string;
                int len = strlen(path);
@@ -1265,13 +1257,9 @@ static int merge_content(struct merge_options *o,
        }
 
        if (mfi.clean && !df_conflict_remains &&
-           sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode &&
-           !o->call_depth && !lstat(path, &st)) {
+           sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode)
                output(o, 3, "Skipped %s (merged same as existing)", path);
-               add_cacheinfo(mfi.mode, mfi.sha, path,
-                             0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
-               return mfi.clean;
-       } else
+       else
                output(o, 2, "Auto-merging %s", path);
 
        if (!mfi.clean) {