[PATCH] Avoid rename/add conflict when contents are identical

From

SKSchalk, Ken <ken.schalk@intel.com>

Date

Aug 9, 2010, 21:00 UTC

Message-ID

<5C4EA6C5B30E6B45A9164CB3A26A0D326F79D9AA04@azsmsx503.amr.corp.intel.com>

Here's a simple sequence that generates this kind of conflict:

  git init
  echo content > fileA
  git add fileA
  git commit -m Initial
  git checkout -b abranch
  mv fileA fileB
  git add fileB
  rm fileA
  ln -s fileB fileA
  git add fileA
  git commit -m Linked
  git checkout master
  git mv fileA fileB
  git add fileB
  git commit -m Moved
  git merge --no-commit abranch

Signed-off-by: Ken Schalk <ken.schalk@intel.com>
---
 merge-recursive.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index fb6aa4a..57c7a85 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -955,6 +955,18 @@ static int process_renames(struct merge_options *o,
                                                        ren1->pair->two : NULL,
                                                        branch1 == o->branch1 ?
                                                        NULL : ren1->pair->two, 1);
+                       } else if ((dst_other.mode == ren1->pair->two->mode) &&
+                                  sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
+                               /* Added file on the other side
+                                  identical to the file being
+                                  renamed: clean merge */
+                               update_file(o, 1, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
+                               if (!o->call_depth)
+                                       update_stages(ren1_dst, NULL,
+                                                       branch1 == o->branch1 ?
+                                                       ren1->pair->two : NULL,
+                                                       branch1 == o->branch1 ?
+                                                       NULL : ren1->pair->two, 1);
                        } else if (!sha_eq(dst_other.sha1, null_sha1)) {
                                const char *new_path;
                                clean_merge = 0;
--
1.7.0