diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:37 -0700 |
| commit | 35381b13da846cc6ad620f9f9a5abf1d974d6e9b (patch) | |
| tree | 9fbbe703441c5c11848cb140e88a46211703f483 /t/t6030-bisect-porcelain.sh | |
| parent | Merge branch 'jh/fsmonitor-prework' (diff) | |
| parent | bisect: peel annotated tags to commits (diff) | |
| download | tgif-35381b13da846cc6ad620f9f9a5abf1d974d6e9b.tar.xz | |
Merge branch 'jk/bisect-peel-tag-fix'
"git bisect" reimplemented more in C during 2.30 timeframe did not
take an annotated tag as a good/bad endpoint well. This regression
has been corrected.
* jk/bisect-peel-tag-fix:
bisect: peel annotated tags to commits
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 0ba5a91b4e..32bb66e1ed 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -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 |