From: Christian Couder <chriscool@tuxfamily.org>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, j6t@kdbg.org, jnareb@gmail.com
Subject: Re: [PATCH v14 8/8] bisect: change bisect function to update BISECT_HEAD, rather than HEAD.
Date: Wed, 3 Aug 2011 06:43:08 +0200 [thread overview]
Message-ID: <201108030643.09014.chriscool@tuxfamily.org> (raw)
In-Reply-To: <1312323362-20096-9-git-send-email-jon.seymour@gmail.com>
I think a better title for this patch would be something like:
bisect: update BISECT_HEAD, rather than HEAD, when using --no-checkout
But anyway in my opinion the patch series would be better if this patch was
squashed into the previous patches.
On Wednesday 03 August 2011 00:16:02 Jon Seymour wrote:
> This function modifies git-bisect so that the --no-checkout option
> uses BISECT_HEAD rather than HEAD to record the current bisection
> head.
s/This function/This patch/
> The intent is to reduce the confusion that uses of --no-checkout
s/uses/users/
> may experience when using the --no-checkout option since the bisection
> process will no longer introduce spurious differences between the
> HEAD reference and the working tree and index.
>
> Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
> ---
> Documentation/git-bisect.txt | 8 ++++----
> bisect.c | 2 +-
> builtin/bisect--helper.c | 2 +-
> git-bisect.sh | 17 +++++++++++++----
> t/t6030-bisect-porcelain.sh | 30 +++++++++++++++---------------
> 5 files changed, 34 insertions(+), 25 deletions(-)
>
> diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
> index 2014894..a9b217b 100644
> --- a/Documentation/git-bisect.txt
> +++ b/Documentation/git-bisect.txt
> @@ -267,9 +267,9 @@ OPTIONS
> -------
> --no-checkout::
> +
> -This option is used to specify that 'git bisect' should not modify the
> working -tree or index on each iteration of the bisection process but
> should -update HEAD instead.
> +This option is used to specify that 'git bisect' should not checkout the
> +new working tree at each iteration of the bisection process but should
> +instead update BISECT_HEAD.
I would say something like:
Do not checkout the new working tree at each iteration of the bisection
process. Instead just update a special reference named 'BISECT_HEAD' to make
it point to the commit that should be tested.
> +
> This option is useful in circumstances in which checkout is either not
> possible (because of a damaged respository) or is otherwise not required.
Thanks,
Christian.
prev parent reply other threads:[~2011-08-03 4:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 22:15 [PATCH v14 0/8] bisect: Add support for --no-checkout option Jon Seymour
2011-08-02 22:15 ` [PATCH v14 1/8] bisect: move argument parsing before state modification Jon Seymour
2011-08-02 22:15 ` [PATCH v14 2/8] bisect: use && to connect statements that are deferred with eval Jon Seymour
2011-08-02 22:15 ` [PATCH v14 3/8] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
2011-08-02 22:15 ` [PATCH v14 4/8] bisect: introduce support for --no-checkout option Jon Seymour
2011-08-02 22:15 ` [PATCH v14 5/8] bisect: introduce --no-checkout support into porcelain Jon Seymour
2011-08-02 23:01 ` Junio C Hamano
2011-08-02 23:16 ` Junio C Hamano
2011-08-03 5:28 ` Christian Couder
2011-08-03 13:16 ` Jon Seymour
2011-08-03 15:24 ` Jon Seymour
2011-08-03 17:01 ` Junio C Hamano
2011-08-03 18:57 ` Jonathan Nieder
2011-08-03 21:40 ` Jon Seymour
2011-08-03 21:45 ` Jonathan Nieder
2011-08-03 5:17 ` Christian Couder
2011-08-02 22:16 ` [PATCH v14 6/8] bisect: add tests for the --no-checkout option Jon Seymour
2011-08-02 22:16 ` [PATCH v14 7/8] bisect: add documentation for " Jon Seymour
2011-08-02 22:16 ` [PATCH v14 8/8] bisect: change bisect function to update BISECT_HEAD, rather than HEAD Jon Seymour
2011-08-03 4:43 ` Christian Couder [this message]
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=201108030643.09014.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jnareb@gmail.com \
--cc=jon.seymour@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;
as well as URLs for NNTP newsgroup(s).