mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 03:14:02 +01:00
Code

[PATCH] Fix assertion failure when merging common ancestors.

Browse Source 
Bug reported by Junio.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Fredrik Kuivinen 2005-09-12 23:29:06 +02:00 committed by Junio C Hamano
parent 540bf654d0
commit 8ceba720ba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-fredrik.py
View File

@ -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: