From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Mon, 12 Sep 2005 21:29:06 +0000 (+0200)
Subject: [PATCH] Fix assertion failure when merging common ancestors.
X-Git-Tag: v0.99.7~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ceba720ba5e5e76384e46629e599124c6f36409;p=git.git

[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 920e10ffb..9a05ab797 100755
--- a/git-merge-fredrik.py
+++ b/git-merge-fredrik.py
@@ -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: