From: john at keeping.me.uk (John Keeping)
Subject: Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8
Date: Wed, 12 Aug 2015 16:41:34 +0100 [thread overview]
Message-ID: <20150812154134.GM30507@serenity.lan> (raw)
In-Reply-To: <55CB6500.6050303@hupie.com>
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 <john at keeping.me.uk>
---
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
next prev parent reply other threads:[~2015-08-12 15:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <636854575.8.1439391876094.JavaMail.jenkins@jenkins-public.internal.hupie.com>
2015-08-12 15:23 ` mailings
2015-08-12 15:41 ` john [this message]
2015-08-12 15:43 ` Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150812154134.GM30507@serenity.lan \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).