---
On Sat, Feb 09, 2013 at 03:39:33PM -0800, Junio C Hamano wrote:
> * jk/diff-graph-cleanup (2013-02-07) 6 commits
> - combine-diff.c: teach combined diffs about line prefix
> - diff.c: use diff_line_prefix() where applicable
> - diff: add diff_line_prefix function
> - diff.c: make constant string arguments const
> - diff: write prefix to the correct file
> - graph: output padding for merge subsequent parents
>
> Refactors a lot of repetitive code sequence from the graph drawing
> code and adds it to the combined diff output.
>
> Will merge to 'next'.
Can you squash this into the first commit before you do?
Matthieu is correct that the graph_is_commit_finished() check isn't
needed in the loop now that we've pulled it out to be checked first -
the value returned can't change during the loop. I've left the early
return out.
graph.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/graph.c b/graph.c
index 2a3fc5c..56f970f 100644
--- a/graph.c
+++ b/graph.c
@@ -1237,7 +1237,7 @@ void graph_show_commit(struct git_graph *graph)
shown_commit_line = 1;
}
- while (!shown_commit_line && !graph_is_commit_finished(graph)) {
+ while (!shown_commit_line) {
shown_commit_line = graph_next_line(graph, &msgbuf);
fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
if (!shown_commit_line)
--
1.8.1.2
--
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