Code

[PATCH] Fix assertion failure when merging common ancestors.
authorFredrik Kuivinen <freku045@student.liu.se>
Mon, 12 Sep 2005 21:29:06 +0000 (23:29 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Sep 2005 21:53:55 +0000 (14:53 -0700)
Bug reported by Junio.

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

index 920e10ffbf6ead119d8caabfa043281cec1b9d73..9a05ab797c5cf817384c5921d87803f7734de7b3 100755 (executable)
@@ -60,7 +60,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
                                  branch1Name, branch2Name,
                                  cleanCache, updateWd)
 
-    if clean or alwaysWriteTree:
+    if clean or cleanCache:
         res = Commit(None, [h1, h2], tree=shaRes)
         graph.addNode(res)
     else: