From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v5 3/7] bisect: treat BISECT_HEAD as a ref
Date: Mon, 29 Jun 2015 13:54:24 -0400 [thread overview]
Message-ID: <1435600468-21710-4-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1435600468-21710-1-git-send-email-dturner@twopensource.com>
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>
---
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>'.")"
--
2.0.4.315.gad8727a-twtrsrc
next prev parent reply other threads:[~2015-06-29 17:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-29 17:54 [PATCH v5 0/7] refs backend preamble David Turner
2015-06-29 17:54 ` [PATCH v5 1/7] refs.c: add err arguments to reflog functions David Turner
2015-06-29 17:54 ` [PATCH v5 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs David Turner
2015-06-29 17:54 ` David Turner [this message]
2015-06-29 17:54 ` [PATCH v5 4/7] refs: Break out check for reflog autocreation David Turner
2015-06-29 17:54 ` [PATCH v5 5/7] refs: new public ref function: safe_create_reflog David Turner
2015-06-29 17:54 ` [PATCH v5 6/7] git-reflog: add create and exists functions David Turner
2015-06-29 17:54 ` [PATCH v5 7/7] git-stash: use git-reflog instead of creating files David Turner
2015-06-29 19:11 ` [PATCH v5 0/7] refs backend preamble 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
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=1435600468-21710-4-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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).