On Wed, Aug 12, 2015 at 05:23:44PM +0200, Ferry Huberts wrote: > Makefile:8: recipe for target 't0103-log.sh' failed > make[1]: *** [t0103-log.sh] Error 1 > Makefile:75: recipe for target 'test' failed > make: *** [test] Error 2 > Build step 'Execute shell' marked build as failure > Archiving artifacts
I was a bit too quick with rebasing the log-follow topic onto the updated master and ended up with some double counting (thus halving the number of log entries that get shown). This fixes it: -- >8 -- Subject: [PATCH] ui-log: fix double counting This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <[email protected]> --- ui-log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-log.c b/ui-log.c index ff832ce..6bff948 100644 --- a/ui-log.c +++ b/ui-log.c @@ -476,7 +476,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern if (ofs<0) ofs = 0; - for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { + for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) { if (show_commit(commit, &rev)) i++; free_commit_buffer(commit); @@ -484,7 +484,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern commit->parents = NULL; } - for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { + for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; /* nop */) { /* * In "follow" mode, we must count the files and lines the * first time we invoke diff on a given commit, and we need -- 2.5.0.466.g9af26fa _______________________________________________ CGit mailing list [email protected] http://lists.zx2c4.com/mailman/listinfo/cgit
