Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / t / t6030-bisect-porcelain.sh

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index ef7bdcedf2304ef3e6d1379f29742dcfcf5ee28b..32bb66e1eda44cfa1de67ab7c168bd856fc9d421 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -578,9 +578,9 @@ test_expect_success 'skipping away from skipped commit' '
        test "$para3" = "$PARA_HASH3"
 '
 
-test_expect_success 'erroring out when using bad path parameters' '
+test_expect_success 'erroring out when using bad path arguments' '
        test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
-       test_i18ngrep "bad path parameters" error.txt
+       test_i18ngrep "bad path arguments" error.txt
 '
 
 test_expect_success 'test bisection on bare repo - --no-checkout specified' '
@@ -939,4 +939,16 @@ test_expect_success 'git bisect reset cleans bisection state properly' '
        test_path_is_missing ".git/BISECT_START"
 '
 
+test_expect_success 'bisect handles annotated tags' '
+       test_commit commit-one &&
+       git tag -m foo tag-one &&
+       test_commit commit-two &&
+       git tag -m foo tag-two &&
+       git bisect start &&
+       git bisect good tag-one &&
+       git bisect bad tag-two >output &&
+       bad=$(git rev-parse --verify tag-two^{commit}) &&
+       grep "$bad is the first bad commit" output
+'
+
 test_done