| commit | f1bf4ee6d78209a1c45cca1bf3b38252208434d2 | |
| author | Paul Mackerras <paulus@samba.org> | |
| Sat, 16 Feb 2008 06:47:31 +0000 (16 17:47 +1100) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Sat, 16 Feb 2008 11:22:22 +0000 (16 22:22 +1100) | ||
| tree | 7a2b99c2f6222663857c65795e32f0fd86c47be3 | treesnapshot (tar.gz zip) |
| parent | b8a938cf78026eedafc202716b27986fdacb86e3 | commitdiff |
gitk: Cope better with getting commits that we have already seen
This fixes a bug in updating the graph after we have cherry-picked
a commit in gitk and then added some new stuff externally. First,
we weren't updating viewincl with the new head added by the cherry-
pick. Secondly, getcommitlines was doing bad things if it saw a
commit that was already in the graph (was already in an arc). This
fixes both things. If getcommitlines sees a commit that is already
in the graph, it ignores it unless it was not listed before and is
listed now. In that case it doesn't assign it a new arc now, and
doesn't re-add the commit to its arc.
Signed-off-by: Paul Mackerras <paulus@samba.org>
This fixes a bug in updating the graph after we have cherry-picked
a commit in gitk and then added some new stuff externally. First,
we weren't updating viewincl with the new head added by the cherry-
pick. Secondly, getcommitlines was doing bad things if it saw a
commit that was already in the graph (was already in an arc). This
fixes both things. If getcommitlines sees a commit that is already
in the graph, it ignores it unless it was not listed before and is
listed now. In that case it doesn't assign it a new arc now, and
doesn't re-add the commit to its arc.
Signed-off-by: Paul Mackerras <paulus@samba.org>
| gitk | diffblobblamehistory |