[PATCH] Fix assertion failure when merging common ancestors.

Bug reported by Junio.

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

diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py
index 920e10ffbf6ead119d8caabfa043281cec1b9d73..9a05ab797c5cf817384c5921d87803f7734de7b3 100755 (executable)
--- a/git-merge-fredrik.py
+++ b/git-merge-fredrik.py
@@ -60,7 +60,7 @@ def infoMsg(*args):
                                  branch1Name, branch2Name,
                                  cleanCache, updateWd)
 
-    if clean or alwaysWriteTree:
+    if clean or cleanCache:
         res = Commit(None, [h1, h2], tree=shaRes)
         graph.addNode(res)
     else: