From: Junio C Hamano <gitster@pobox•com>
To: David Turner <dturner@twopensource•com>
Cc: git@vger•kernel.org, mhagger@alum•mit.edu
Subject: Re: [PATCH v3 3/7] bisect: treat BISECT_HEAD as a ref
Date: Fri, 26 Jun 2015 14:46:17 -0700 [thread overview]
Message-ID: <xmqqtwturvme.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435278548-3790-3-git-send-email-dturner@twopensource.com> (David Turner's message of "Thu, 25 Jun 2015 20:29:04 -0400")
David Turner <dturner@twopensource•com> writes:
> Instead of directly writing to and reading from files in
> $GIT_DIR, use ref API to interact with BISECT_HEAD.
>
> Signed-off-by: David Turner <dturner@twopensource•com>
> ---
Interesting. From the patch, it seems that the codepath that writes
BISECT_HEAD were already doing update-ref instead of writing into or
removing a file.
The result of applying this patch looked sane. Thanks.
> git-bisect.sh | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/git-bisect.sh b/git-bisect.sh
> index ae3fec2..dddcc89 100755
> --- a/git-bisect.sh
> +++ b/git-bisect.sh
> @@ -35,7 +35,7 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
>
> bisect_head()
> {
> - if test -f "$GIT_DIR/BISECT_HEAD"
> + if bisect_head_exists
> then
> echo BISECT_HEAD
> else
> @@ -209,6 +209,10 @@ check_expected_revs() {
> done
> }
>
> +bisect_head_exists() {
> + git rev-parse --quiet --verify "BISECT_HEAD" >/dev/null
> +}
> +
> bisect_skip() {
> all=''
> for arg in "$@"
> @@ -310,7 +314,7 @@ bisect_next() {
> bisect_next_check good
>
> # Perform all bisection computation, display and checkout
> - git bisect--helper --next-all $(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout)
> + git bisect--helper --next-all $(bisect_head_exists && echo --no-checkout)
> res=$?
>
> # Check if we should exit because bisection is finished
> @@ -377,7 +381,7 @@ bisect_reset() {
> usage ;;
> esac
>
> - if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout "$branch" --
> + if ! bisect_head_exists && ! git checkout "$branch" --
> then
> die "$(eval_gettext "Could not check out original HEAD '\$branch'.
> Try 'git bisect reset <commit>'.")"
next prev parent reply other threads:[~2015-06-26 21:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 0:29 [PATCH v3 1/7] refs.c: add err arguments to reflog functions David Turner
2015-06-26 0:29 ` [PATCH v3 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs David Turner
2015-06-26 21:42 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 3/7] bisect: treat BISECT_HEAD as a ref David Turner
2015-06-26 21:46 ` Junio C Hamano [this message]
2015-06-26 0:29 ` [PATCH v3 4/7] refs: Break out check for reflog autocreation David Turner
2015-06-26 22:01 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 5/7] refs: add safe_create_reflog function David Turner
2015-06-26 22:12 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 6/7] git-reflog: add create and exists functions David Turner
2015-06-26 0:29 ` [PATCH v3 7/7] git-stash: use git-reflog instead of creating files David Turner
2015-06-26 22:14 ` Junio C Hamano
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=xmqqtwturvme.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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