diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-04-11 23:56:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-04-11 23:56:09 -0700 |
commit | 4cdda2b895dfb6ba084e3952cbf4274a6a2e0338 (patch) | |
tree | d924f60957a287ea138ce59580c05e71e3f9c2f1 /git-bisect.sh | |
parent | bisect: add "git bisect help" subcommand to get a long usage string (diff) | |
parent | Merge branch 'maint-1.5.4' into maint (diff) | |
download | tgif-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.xz |
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-x | git-bisect.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index a1343f61db..ff904e60d9 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 |