From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
git@vger.kernel.org, remi.lespinet@ensimag.grenoble-inp.fr,
louis--alexandre.stuber@ensimag.grenoble-inp.fr,
remi.galan-alfonso@ensimag.grenoble-inp.fr,
guillaume.pages@ensimag.grenoble-inp.fr, chriscool@tuxfamily.org,
thomasxnguy@gmail.com, valentinduperray@gmail.com
Subject: Re: [PATCH v2 7/7] bisect: allows any terms set by user
Date: Thu, 11 Jun 2015 07:57:45 -0700 [thread overview]
Message-ID: <xmqqa8w6gumu.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpqk2vaoa2t.fsf@anie.imag.fr> (Matthieu Moy's message of "Thu, 11 Jun 2015 11:42:18 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> +bisect_terms () {
>>> + test $# -eq 2 ||
>>> + die "You need to give me at least two arguments"
>>> +
>>> + if ! test -s "$GIT_DIR/BISECT_START"
>>> + then
>>> + echo $1 >"$GIT_DIR/BISECT_TERMS" &&
>>> + echo $2 >>"$GIT_DIR/BISECT_TERMS" &&
>>> + echo "1" > "$GIT_DIR/TERMS_DEFINED"
>>> + else
>>> + die "A bisection has already started, please use "\
>>> + "'git bisect reset' to restart and change the terms"
>>> + fi
>>> +}
>>> +
>>
>> I think "git bisect terms" is a good way to help a user to recall
>> what two names s/he decided to use for the current session. So
>> dying 'already started' with suggestion for 'reset' is OK, but at
>> the same time, helping the user to continue the current bisection by
>> giving a message along the lines of "You are hunting for a commit
>> that is at the boundary of the old state (you are calling it
>> '$NAME_OLD') and the new state ('$NAME_NEW')" would be a good idea.
>
> I'd put a very verbose message explaining the situation and the way out
> (use 'git bisect') for the second "die", and I would consider "git
> bisect terms" without arguments as a valid command to ask "please tell
> me what the terms are".
Of course you are right. The "remind me what I was doing" help
should be given when the user asks "git bisect terms" without any
parameters, not in "else die" part.
Thanks for a correction.
next prev parent reply other threads:[~2015-06-11 14:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 19:01 [PATCH v2 5/7] bisect: change read_bisect_terms parameters Antoine Delaite
2015-06-10 19:01 ` [PATCH v2 6/7] revision: fix rev-list --bisect in old/new mode Antoine Delaite
2015-06-10 19:01 ` [PATCH v2 7/7] bisect: allows any terms set by user Antoine Delaite
2015-06-10 21:16 ` Junio C Hamano
2015-06-10 22:19 ` Junio C Hamano
2015-06-11 9:42 ` Matthieu Moy
2015-06-11 14:57 ` Junio C Hamano [this message]
2015-06-11 9:22 ` Matthieu Moy
2015-06-11 15:03 ` Junio C Hamano
2015-06-11 15:28 ` Matthieu Moy
2015-06-14 12:39 ` Louis-Alexandre Stuber
2015-06-14 19:30 ` Antoine Delaite
2015-06-15 8:37 ` Matthieu Moy
2015-06-15 16:08 ` Junio C Hamano
2015-06-16 21:18 ` Antoine Delaite
2015-06-17 7:05 ` Matthieu Moy
2015-06-17 8:01 ` Antoine Delaite
2015-06-17 8:18 ` Matthieu Moy
2015-06-14 19:40 ` Antoine Delaite
2015-06-14 20:05 ` Antoine Delaite
2015-06-15 8:56 ` Matthieu Moy
2015-06-15 8:52 ` Matthieu Moy
2015-06-16 21:07 ` Antoine Delaite
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=xmqqa8w6gumu.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
--cc=thomasxnguy@gmail.com \
--cc=valentinduperray@gmail.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