summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-02 18:39:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-02 18:39:09 (GMT)
commit4b32367ddc63fc2a3e50986509f2f6323f227fef (patch)
tree12d73c92bc668a397b048e26c2c9b2a271666007 /graph.c
parent77ecfd02de5c8d9186ab1b3640da014e3f4bdada (diff)
parent656197ad380506ca0e8a0355701f9d9a4a398f66 (diff)
downloadgit-4b32367ddc63fc2a3e50986509f2f6323f227fef.zip
git-4b32367ddc63fc2a3e50986509f2f6323f227fef.tar.gz
git-4b32367ddc63fc2a3e50986509f2f6323f227fef.tar.bz2
Merge branch 'mk/maint-graph-infinity-loop'
The --graph code fell into infinite loop when asked to do what the code did not expect. * 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 e864fe2..391a712 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)