From ee2314f59a4eb8451008d4468fd96bb4e40763dc Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 23 Nov 2008 22:02:49 +0100 Subject: [PATCH] bisect: teach "skip" to accept special arguments like "A..B" The current "git bisect skip" syntax is "git bisect skip [...]" so it's already possible to skip a range of revisions using something like: $ git bisect skip $(git rev-list A..B) where A and B are the bounds of the range we want to skip. This patch teaches "git bisect skip" to accept: $ git bisect skip A..B as an abbreviation for the former command. This is done by checking each argument to see if it contains two dots one after the other ('..'), and by expending it using "git rev-list" if that is the case. Note that this patch will not make "git bisect skip" accept all that "git rev-list" accepts, as things like "^A B" for exemple will not work. But things like "A B..C D E F.. ..G H...I" should work as expected. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- git-bisect.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/git-bisect.sh b/git-bisect.sh index 0d0e278c9..6706bc1e7 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -191,6 +191,21 @@ check_expected_revs() { done } +bisect_skip() { + all='' + for arg in "$@" + do + case "$arg" in + *..*) + revs=$(git rev-list "$arg") || die "Bad rev input: $arg" ;; + *) + revs="'$arg'" ;; + esac + all="$all $revs" + done + bisect_state 'skip' $all +} + bisect_state() { bisect_autostart state=$1 @@ -630,8 +645,10 @@ case "$#" in git bisect -h ;; start) bisect_start "$@" ;; - bad|good|skip) + bad|good) bisect_state "$cmd" "$@" ;; + skip) + bisect_skip "$@" ;; next) # Not sure we want "next" at the UI level anymore. bisect_next "$@" ;; -- 2.26.2