From: Jeff King <peff@peff.net>
To: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: final git bisect step leads to: "fatal: you want to use way too much memory"
Date: Thu, 16 Jun 2016 09:47:42 -0400 [thread overview]
Message-ID: <20160616134742.GA25920@sigill.intra.peff.net> (raw)
In-Reply-To: <20160616132952.GC314@x4>
On Thu, Jun 16, 2016 at 03:29:52PM +0200, Markus Trippelsdorf wrote:
> On 2016.06.16 at 14:53 +0200, Markus Trippelsdorf wrote:
> > markus@x4 gcc % git bisect good
> > f216419e5c4c41df70dbe00a6ea1faea46484dc8 is the first bad commit
> > commit f216419e5c4c41df70dbe00a6ea1faea46484dc8
> > fatal: you want to use way too much memory
> > markus@x4 gcc %
>
> The issue started with:
>
> commit fe37a9c586a65943e1bca327a1bbe1ca4a3d3023
> Author: Junio C Hamano <gitster@pobox.com>
> Date: Tue Mar 29 16:05:39 2016 -0700
>
> pretty: allow tweaking tabwidth in --expand-tabs
Interesting. But `git show` on the commit in question (f216419e5) does
not have any problems. It looks like bisect's internal "show the commit"
code does not properly call setup_revisions() to finalize the "struct
rev_info". That leaves the expand_tabs_in_log flag as "-1", which then
ends up cast to an unsigned of 2^64 when we use it in a size
computation.
And who knows what other bugs have been lurking there over the years;
there are other flags that should be finalized by setup_revision(), too.
This patch should fix it.
diff --git a/bisect.c b/bisect.c
index 6d93edb..dc13319 100644
--- a/bisect.c
+++ b/bisect.c
@@ -890,6 +890,7 @@ static void show_diff_tree(const char *prefix, struct commit *commit)
if (!opt.diffopt.output_format)
opt.diffopt.output_format = DIFF_FORMAT_RAW;
+ setup_revisions(0, NULL, &opt, NULL);
log_tree_commit(&opt, commit);
}
next prev parent reply other threads:[~2016-06-16 13:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 12:53 final git bisect step leads to: "fatal: you want to use way too much memory" Markus Trippelsdorf
2016-06-16 12:55 ` Markus Trippelsdorf
2016-06-16 13:29 ` Markus Trippelsdorf
2016-06-16 13:47 ` Jeff King [this message]
2016-06-16 18:36 ` Junio C Hamano
2016-06-16 23:37 ` [PATCH] bisect: always call setup_revisions after init_revisions Jeff King
2016-06-17 0:03 ` Junio C Hamano
2016-06-17 0:15 ` Jeff King
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=20160616134742.GA25920@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus@trippelsdorf.de \
/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).