From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org,
jnareb@gmail.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v8 7/7] bisect: support --update-ref <ref>
Date: Sun, 31 Jul 2011 21:55:21 +1000 [thread overview]
Message-ID: <1312113321-28760-8-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312113321-28760-1-git-send-email-jon.seymour@gmail.com>
Adds sugar to allow --update-ref=<ref> to be expressed as
--update-ref <ref> instead.
Suggested-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
git-bisect.sh | 13 +++++++++++--
t/t6030-bisect-porcelain.sh | 16 ++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/git-bisect.sh b/git-bisect.sh
index 24ac859..ec70cd2 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -79,8 +79,17 @@ bisect_start() {
shift; break ;;
--no-checkout)
BISECT_UPDATE_REF=HEAD; shift ;;
- --update-ref=*)
- BISECT_UPDATE_REF=${arg#--update-ref=}; shift ;;
+ --update-ref*)
+ case "$#,$arg" in
+ *,*=*)
+ BISECT_UPDATE_REF=`expr "z$1" : 'z-[^=]*=\(.*\)'`
+ ;;
+ 1,*)
+ usage ;;
+ *)
+ BISECT_UPDATE_REF="$2"; shift ;;
+ esac
+ shift ;;
--*)
die "$(eval_gettext "unrecognised option: '\$arg'")" ;;
*)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 69d77fa..fa4366f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -705,6 +705,22 @@ test_expect_success 'bisect: --no-checkout --update-ref=CURSOR - check HEAD is u
check_same broken $BROKEN
'
+test_expect_success 'bisect: --no-checkout --update-ref CURSOR' '
+ git bisect reset &&
+ git checkout broken &&
+ BROKEN=$(git rev-parse broken) &&
+ git bisect start broken BROKEN_HASH4 --no-checkout --update-ref CURSOR &&
+ check_same CURSOR BROKEN_HASH6 &&
+ test "refs/heads/broken" = "$(git rev-parse --symbolic-full-name HEAD)"
+'
+
+test_expect_success 'bisect: --no-checkout --update-ref -> fails' '
+ git bisect reset &&
+ git checkout broken &&
+ BROKEN=$(git rev-parse broken) &&
+ test_must_fail git bisect start broken BROKEN_HASH4 --no-checkout --update-ref
+'
+
test_expect_success 'bisect: demonstrate identification of damage boundary' "
git bisect reset &&
git checkout broken &&
--
1.7.6.391.g168d0.dirty
next prev parent reply other threads:[~2011-07-31 11:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-31 11:55 [PATCH v8 0/7] bisect: Add support for --no-checkout and --update-ref=<ref> options Jon Seymour
2011-07-31 11:55 ` [PATCH v8 1/7] bisect: move argument parsing before state modification Jon Seymour
2011-07-31 11:55 ` [PATCH v8 2/7] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
2011-07-31 11:55 ` [PATCH v8 3/7] bisect: introduce support for --update-ref=<ref> option Jon Seymour
2011-07-31 11:55 ` [PATCH v8 4/7] bisect: introduce --no-checkout, --update-ref=<ref> support into porcelain Jon Seymour
2011-07-31 18:35 ` Christian Couder
2011-07-31 19:48 ` Jon Seymour
2011-07-31 20:05 ` Christian Couder
2011-07-31 19:21 ` Christian Couder
2011-07-31 19:40 ` Jon Seymour
2011-07-31 20:07 ` Christian Couder
2011-07-31 20:51 ` Christian Couder
2011-07-31 21:11 ` Jon Seymour
2011-07-31 11:55 ` [PATCH v8 5/7] bisect: add tests for the --no-checkout and --update-ref options Jon Seymour
2011-07-31 11:55 ` [PATCH v8 6/7] bisect: add documentation for --no-checkout and --update-ref=<ref> options Jon Seymour
2011-07-31 11:55 ` Jon Seymour [this message]
2011-07-31 13:26 ` [PATCH v8 0/7] bisect: Add support " Jon Seymour
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=1312113321-28760-8-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jnareb@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).