From 8ceba720ba5e5e76384e46629e599124c6f36409 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Mon, 12 Sep 2005 23:29:06 +0200 Subject: [PATCH] [PATCH] Fix assertion failure when merging common ancestors. Bug reported by Junio. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-fredrik.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py index 920e10ff..9a05ab79 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: -- 2.11.0