summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-12 06:56:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-12 06:56:09 (GMT)
commit4cdda2b895dfb6ba084e3952cbf4274a6a2e0338 (patch)
treed924f60957a287ea138ce59580c05e71e3f9c2f1 /git-bisect.sh
parent243a60fbb5e185e2bf3c4bb1c53128b4d04d5879 (diff)
parenteed81838f0d0e031702473e1d427d71055134edd (diff)
downloadgit-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.zip
git-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.gz
git-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.bz2
Merge branch 'maint'
* maint: bisect: fix bad rev checking in "git bisect good" revision.c: make --date-order overriddable git-submodule: Avoid 'fatal: cannot describe' message Force the medium pretty format on calls to git log 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 a1343f6..ff904e6 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -155,20 +155,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