Adam Simpkins <adam@xxxxxxxxxxxxxxxx> writes: > When an octopus merge is printed, several lines are printed before it to > move over existing branch lines to its right. This is needed to make > room for the children of the octopus merge. For example: > > | | | | > | | \ \ > | | \ \ > | | \ \ > | M---. \ \ > | |\ \ \ \ \ > > However, this step isn't necessary if there are no branch lines to the > right of the octopus merge. Therefore, skip this step when it is not > needed, to avoid printing extra lines that don't really serve any > purpose. > > Signed-off-by: Adam Simpkins <adam@xxxxxxxxxxxxxxxx> > --- > graph.c | 13 ++++++++----- > 1 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/graph.c b/graph.c > index 332d1e8..0531716 100644 > --- a/graph.c > +++ b/graph.c > @@ -450,16 +450,18 @@ void graph_update(struct git_graph *graph, struct commit *commit) > * it never finished its output. Goto GRAPH_SKIP, to print out > * a line to indicate that portion of the graph is missing. > * > - * Otherwise, if there are 3 or more parents, we need to print > - * extra rows before the commit, to expand the branch lines around > - * it and make room for it. > + * If there are 3 or more parents, we may need to print extra rows > + * before the commit, to expand the branch lines around it and make > + * room for it. We need to do this unless there aren't any branch > + * rows to the right of this commit. Double negation like this is confusing, isn't it? "We do not have to do this if there isn't any branch row to the right of this commit" may be better. "We need to do this only if there is a branch row (or more) to the right of this commit" would probably be better. Other than that, the code looks sane to me. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
