From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Christian Couder <christian.couder@gmail.com>,
Bartosz Baranowski <bbaranow@redhat.com>,
git@vger.kernel.org
Subject: [PATCH 0/3] prettier bisect output
Date: Fri, 22 Feb 2019 01:19:49 -0500 [thread overview]
Message-ID: <20190222061949.GA9875@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq1s40u8gt.fsf@gitster-ct.c.googlers.com>
On Thu, Feb 21, 2019 at 01:39:46PM -0800, Junio C Hamano wrote:
> > git bisect good
> > 3a9388eef42efc87c78ce22158d55e69a278b4eb is the first bad commit
> >
> > git --version
> > git version 2.14.1
>
> Are you sure (and if so how did you reach that conclusion) that the
> above difference comes from the last 'bad' vs 'good' you finished,
> and not comes from the difference between 77c044d8 vs 3a9388ee?
>
> At the end of the bisection session, bisect.c::show_diff_tree() is
> called on that "culprit" commit. Is it possible that 3a9388ee is a
> simple and trivial merge that does not have anything worth reporting
> for "git diff-tree"?
I've run across this many times, too. Since it's been bugging me for a
decade, I thought I'd finally try to address it. Here are some patches.
There was some discussion about a year ago about just using "git show"
for this output:
https://public-inbox.org/git/CAP8UFD3QhTUj+j3vBGrm0sTQ2dSOLS-m2_PwFj6DZS4VZHKRTQ@mail.gmail.com/
Christian seemed generally OK with tweaking the output, but preferred
not to move all the way to running an external "git show". I'm not sure
I completely agree, but it was easy enough to get the results I wanted
just by fiddling the current code a bit. ;)
[1/3]: bisect: use string arguments to feed internal diff-tree
[2/3]: bisect: fix internal diff-tree config loading
[3/3]: bisect: make diff-tree output prettier
bisect.c | 19 +++++--------------
t/t6030-bisect-porcelain.sh | 6 +++---
2 files changed, 8 insertions(+), 17 deletions(-)
-Peff
next prev parent reply other threads:[~2019-02-22 6:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 10:47 git bisect - good vs bad output is different Bartosz Baranowski
2019-02-21 21:39 ` Junio C Hamano
2019-02-22 6:19 ` Jeff King [this message]
2019-02-22 6:20 ` [PATCH 1/3] bisect: use string arguments to feed internal diff-tree Jeff King
2019-02-22 6:21 ` [PATCH 2/3] bisect: fix internal diff-tree config loading Jeff King
2019-03-03 17:59 ` Christian Couder
2019-03-05 4:15 ` Jeff King
2019-02-22 6:23 ` [PATCH 3/3] bisect: make diff-tree output prettier Jeff King
2019-02-22 17:49 ` Junio C Hamano
2019-02-23 13:44 ` Jeff King
2019-03-03 18:25 ` Christian Couder
2019-02-22 17:39 ` [PATCH 0/3] prettier bisect output Junio C Hamano
2019-03-03 18:33 ` Christian Couder
2019-03-05 4:16 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190222061949.GA9875@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bbaranow@redhat.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).