merge-recursive: Fix limited output of rename messages

The previous code did the right thing, but it did it by accident.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 9983cd9deec120ed376403a3830ad7ad48683516..36578754ce854fea5ceb457af3630e10f9be9754 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -162,13 +162,10 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name):
 # Low level file merging, update and removal
 # ------------------------------------------
 
 # Low level file merging, update and removal
 # ------------------------------------------
 

-MERGE_NONE = 0
-MERGE_TRIVIAL = 1
-MERGE_3WAY = 2

 def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
               branch1Name, branch2Name):
 
 def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
               branch1Name, branch2Name):
 

-    merge = MERGE_NONE
+    merge = False

     clean = True
 
     if stat.S_IFMT(aMode) != stat.S_IFMT(bMode):
     clean = True
 
     if stat.S_IFMT(aMode) != stat.S_IFMT(bMode):


@@ -181,7 +178,7 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
             sha = bSha
     else:
         if aSha != oSha and bSha != oSha:
             sha = bSha
     else:
         if aSha != oSha and bSha != oSha:

-            merge = MERGE_TRIVIAL
+            merge = True

 
         if aMode == oMode:
             mode = bMode
 
         if aMode == oMode:
             mode = bMode


@@ -211,7 +208,6 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
             os.unlink(src1)
             os.unlink(src2)
 
             os.unlink(src1)
             os.unlink(src2)
 

-            merge = MERGE_3WAY

             clean = (code == 0)
         else:
             assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode))
             clean = (code == 0)
         else:
             assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode))


@@ -590,7 +586,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
                 if merge or not clean:
                     print 'Renaming', fmtRename(path, ren1.dstName)
 
                 if merge or not clean:
                     print 'Renaming', fmtRename(path, ren1.dstName)
 

-                if merge == MERGE_3WAY:
+                if merge:

                     print 'Auto-merging', ren1.dstName
 
                 if not clean:
                     print 'Auto-merging', ren1.dstName
 
                 if not clean:


@@ -668,7 +664,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
                 if merge or not clean:
                     print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
 
                 if merge or not clean:
                     print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
 

-                if merge == MERGE_3WAY:
+                if merge:

                     print 'Auto-merging', ren1.dstName
 
                 if not clean:
                     print 'Auto-merging', ren1.dstName
 
                 if not clean: