summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-14 07:32:18 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-14 07:32:18 -0800
commit6cf0a9e9fc90be167c3b2e0cda1ec67909c89ca7 (patch)
tree9304a2af6e54ba14d1f80a5524429a45800e2e42 /graph.c
parentab60f2ce2ddd1e0199dbc778bfb054a532badde0 (diff)
parent656197ad380506ca0e8a0355701f9d9a4a398f66 (diff)
downloadgit-6cf0a9e9fc90be167c3b2e0cda1ec67909c89ca7.tar.gz
Merge branch 'mk/maint-graph-infinity-loop' into maint
* mk/maint-graph-infinity-loop: graph.c: infinite loop in git whatchanged --graph -m
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/graph.c b/graph.c
index e864fe2c6a..391a712e5e 100644
--- a/graph.c
+++ b/graph.c
@@ -1227,7 +1227,7 @@ void graph_show_commit(struct git_graph *graph)
if (!graph)
return;
- while (!shown_commit_line) {
+ while (!shown_commit_line && !graph_is_commit_finished(graph)) {
shown_commit_line = graph_next_line(graph, &msgbuf);
fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
if (!shown_commit_line)