diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-12 23:29:06 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-09-12 14:53:55 -0700 |
| commit | 8ceba720ba5e5e76384e46629e599124c6f36409 (patch) | |
| tree | 433b0b4d8c83bee9cfde856b0765a8b9cba531db /git-merge-fredrik.py | |
| parent | Allow finding things that begin with a dash in 'git grep' (diff) | |
| download | tgif-8ceba720ba5e5e76384e46629e599124c6f36409.tar.xz | |
[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>
Diffstat (limited to 'git-merge-fredrik.py')
| -rwxr-xr-x | git-merge-fredrik.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py index 920e10ffbf..9a05ab797c 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: |