aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-11 23:56:09 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-11 23:56:09 -0700
commit4cdda2b895dfb6ba084e3952cbf4274a6a2e0338 (patch)
treed924f60957a287ea138ce59580c05e71e3f9c2f1 /t
parent243a60fbb5e185e2bf3c4bb1c53128b4d04d5879 (diff)
parenteed81838f0d0e031702473e1d427d71055134edd (diff)
downloadgit-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.gz
git-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 't')
-rwxr-xr-xt/t6030-bisect-porcelain.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index f471c1526..32d611818 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -71,6 +71,19 @@ test_expect_success 'bisect start with one bad and good' '
git bisect next
'
+test_expect_success 'bisect good and bad fails if not given only revs' '
+ git bisect reset &&
+ git bisect start &&
+ test_must_fail git bisect good foo $HASH1 &&
+ test_must_fail git bisect good $HASH1 bar &&
+ test_must_fail git bisect bad frotz &&
+ test_must_fail git bisect bad $HASH3 $HASH4 &&
+ test_must_fail git bisect skip bar $HASH3 &&
+ test_must_fail git bisect skip $HASH1 foo &&
+ git bisect good $HASH1 &&
+ git bisect bad $HASH4
+'
+
test_expect_success 'bisect reset: back in the master branch' '
git bisect reset &&
echo "* master" > branch.expect &&