git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Trevor Saunders <tbsaunde@tbsaunde.org>, git <git@vger.kernel.org>
Subject: Re: [PATCH v2] bisect: improve output when bad commit is found
Date: Wed, 13 May 2015 11:10:31 +0200	[thread overview]
Message-ID: <CAP8UFD0VsJG6G=sP9mtkwwG30mZeiGwQLs_9d48Ovx=ws15YuA@mail.gmail.com> (raw)
In-Reply-To: <xmqqoalpcm9f.fsf@gitster.dls.corp.google.com>

On Wed, May 13, 2015 at 3:13 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Trevor Saunders <tbsaunde@tbsaunde.org> writes:
>
>> On Tue, May 12, 2015 at 04:24:00PM -0700, Junio C Hamano wrote:
>>> Trevor Saunders <tbsaunde@tbsaunde.org> writes:
>>>
>>> > When the first bad commit has been found git bisect prints something
>>> > like this:
>>> >
>>> >    <40 char sha1> is the first bad commit
>>> >    Commit <40 char sha1>
>>> >    ...
>>> >
>>> >    :100644 100644 10f5e57... a46cfeb... M  bisect.c
>>> >    :100755 100755 ae3fec2... 65a19fa... M  git-bisect.sh
>>> >
>>> > The raw diff output is not really useful, and its kind of silly to print
>>> > the sha1 twice.  Instead lets print something like this:
>>> >
>>> >    The first bad commit is
>>> >    Commit <sha1>
>>> >    ...
>>>
>>> According to +CCouder, this change will break existing people's use
>>> cases.
>>>
>>> See $gmane/268881
>>
>> Well, technically he just said it might be that people are parsing the
>> output and could be broken, but if you'd rather not take that risk then
>> I guess we just have to leave things the way they are.
>
> FWIW.
>
>  - I personally do not agree that those who scripted around "git
>    bisect" (as opposed to those who wrote scripts to be driven by
>    the "bisect run" interface) are worth worrying about.  But I am
>    not the whole of the Git world ;-)

You know in git-bisect.sh:bisect_run() we do:

                if sane_grep "is the first bad commit"
"$GIT_DIR/BISECT_RUN" >/dev/null
                then
                        gettextln "bisect run success"
                        exit 0;
                fi

so we are doing it too!

>  - I personally do not find two same 40-hex on two lines is silly at
>    all.

I agree.

>  - I _do_ think diff-tree --raw output without recursive is silly.
>    It is not useful for humans (it doesn't even give paths fully),
>    and it is insufficient for scripts, which can grok more through
>    information out of the 40-hex.
>
> So perhaps if we keep
>
>         <40 char sha1> is the first bad commit
>
> and then replace the diff-tree output with "show -s", then the
> result would be good enough, I would say.

Yeah I agree.

And for people who want something else we can implement config options.

For example a bisect.outputformat that could be used like in the
following pseudo shell code:

format=$(git config bisect.outputformat)

test -z "$format" && format="medium"

git show -s --format="$format" "$firstbadcommit"

  parent reply	other threads:[~2015-05-13  9:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12 23:19 [PATCH v2] bisect: improve output when bad commit is found Trevor Saunders
2015-05-12 23:24 ` Junio C Hamano
2015-05-13  0:54   ` Trevor Saunders
2015-05-13  1:13     ` Junio C Hamano
2015-05-13  1:36       ` Jeff King
2015-05-13  5:48         ` Junio C Hamano
2015-05-13  9:39         ` Christian Couder
2015-05-13 21:42           ` Jeff King
2015-05-13  9:10       ` Christian Couder [this message]
2015-05-13 17:25         ` Trevor Saunders

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='CAP8UFD0VsJG6G=sP9mtkwwG30mZeiGwQLs_9d48Ovx=ws15YuA@mail.gmail.com' \
    --to=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tbsaunde@tbsaunde.org \
    /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).