diff options
author | Michał Kiedrowicz <michal.kiedrowicz@gmail.com> | 2009-07-25 01:45:00 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-25 11:07:15 -0700 |
commit | 656197ad380506ca0e8a0355701f9d9a4a398f66 (patch) | |
tree | 25e0cd38fc65b43709f3c1665dbb558e3c2652cc /Documentation/technical | |
parent | 0ce2e396ee9fb0fa07e8381b338e49859dbf03db (diff) | |
download | git-656197ad380506ca0e8a0355701f9d9a4a398f66.tar.gz git-656197ad380506ca0e8a0355701f9d9a4a398f66.tar.xz |
graph.c: infinite loop in git whatchanged --graph -m
Running "whatchanged --graph -m" on a simple two-head merges
can fall into infinite loop.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical')
-rw-r--r-- | Documentation/technical/api-history-graph.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/technical/api-history-graph.txt b/Documentation/technical/api-history-graph.txt index d6fc90ac7..18142b6d2 100644 --- a/Documentation/technical/api-history-graph.txt +++ b/Documentation/technical/api-history-graph.txt @@ -33,11 +33,11 @@ The following utility functions are wrappers around `graph_next_line()` and They can all be called with a NULL graph argument, in which case no graph output will be printed. -* `graph_show_commit()` calls `graph_next_line()` until it returns non-zero. - This prints all graph lines up to, and including, the line containing this - commit. Output is printed to stdout. The last line printed does not contain - a terminating newline. This should not be called if the commit line has - already been printed, or it will loop forever. +* `graph_show_commit()` calls `graph_next_line()` and + `graph_is_commit_finished()` until one of them return non-zero. This prints + all graph lines up to, and including, the line containing this commit. + Output is printed to stdout. The last line printed does not contain a + terminating newline. * `graph_show_oneline()` calls `graph_next_line()` and prints the result to stdout. The line printed does not contain a terminating newline. |