summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-04-11 23:55:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-11 23:55:55 -0700
commiteed81838f0d0e031702473e1d427d71055134edd (patch)
treeba71df8000ce5e640f7258e1bb822461e778da23 /git-bisect.sh
parentgit-submodule: Avoid 'fatal: cannot describe' message (diff)
parentbisect: fix bad rev checking in "git bisect good" (diff)
downloadtgif-eed81838f0d0e031702473e1d427d71055134edd.tar.xz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: bisect: fix bad rev checking in "git bisect good" revision.c: make --date-order overriddable Fix section about backdating tags in the git-tag docs Document option --only of git commit Documentation/git-request-pull: Fixed a typo ("send" -> "end")
Diffstat (limited to 'git-bisect.sh')
-rwxr-xr-xgit-bisect.sh14
1 files changed, 5 insertions, 9 deletions
diff --git a/git-bisect.sh b/git-bisect.sh
index 48fb92d612..6644b10e36 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -151,20 +151,16 @@ bisect_state() {
rev=$(git rev-parse --verify HEAD) ||
die "Bad rev input: HEAD"
bisect_write "$state" "$rev" ;;
- 2,bad)
- rev=$(git rev-parse --verify "$2^{commit}") ||
- die "Bad rev input: $2"
- bisect_write "$state" "$rev" ;;
- *,good|*,skip)
+ 2,bad|*,good|*,skip)
shift
- revs=$(git rev-parse --revs-only --no-flags "$@") &&
- test '' != "$revs" || die "Bad rev input: $@"
- for rev in $revs
+ for rev in "$@"
do
rev=$(git rev-parse --verify "$rev^{commit}") ||
- die "Bad rev commit: $rev^{commit}"
+ die "Bad rev input: $rev"
bisect_write "$state" "$rev"
done ;;
+ *,bad)
+ die "'git bisect bad' can take only one argument." ;;
*)
usage ;;
esac