diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:39:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:39:09 -0800 |
commit | 4b32367ddc63fc2a3e50986509f2f6323f227fef (patch) | |
tree | 12d73c92bc668a397b048e26c2c9b2a271666007 /Documentation/technical | |
parent | Merge branch 'ss/svn-prompt' (diff) | |
parent | graph.c: infinite loop in git whatchanged --graph -m (diff) | |
download | tgif-4b32367ddc63fc2a3e50986509f2f6323f227fef.tar.xz |
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 '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 d6fc90ac7e..18142b6d29 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. |