diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:58 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:58 +0900 |
commit | 6b895039f4c81e8b50f0d5f7d22f400e52e9bfc6 (patch) | |
tree | af34ba0aba8da54090942f32102155e74ddf94f7 /t | |
parent | Merge branch 'mm/send-email-cc-cruft' into maint (diff) | |
parent | rev-parse: don't trim bisect refnames (diff) | |
download | tgif-6b895039f4c81e8b50f0d5f7d22f400e52e9bfc6.tar.xz |
Merge branch 'mh/packed-ref-store-prep' into maint
Fix regression to "gitk --bisect" by a recent update.
* mh/packed-ref-store-prep:
rev-parse: don't trim bisect refnames
Diffstat (limited to 't')
-rwxr-xr-x | t/t6002-rev-list-bisect.sh | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh index 534903bbd2..a661408038 100755 --- a/t/t6002-rev-list-bisect.sh +++ b/t/t6002-rev-list-bisect.sh @@ -236,17 +236,31 @@ test_sequence "--bisect" # # -test_expect_success '--bisect can default to good/bad refs' ' +test_expect_success 'set up fake --bisect refs' ' git update-ref refs/bisect/bad c3 && good=$(git rev-parse b1) && git update-ref refs/bisect/good-$good $good && good=$(git rev-parse c1) && - git update-ref refs/bisect/good-$good $good && + git update-ref refs/bisect/good-$good $good +' +test_expect_success 'rev-list --bisect can default to good/bad refs' ' # the only thing between c3 and c1 is c2 git rev-parse c2 >expect && git rev-list --bisect >actual && test_cmp expect actual ' +test_expect_success 'rev-parse --bisect can default to good/bad refs' ' + git rev-parse c3 ^b1 ^c1 >expect && + git rev-parse --bisect >actual && + + # output order depends on the refnames, which in turn depends on + # the exact sha1s. We just want to make sure we have the same set + # of lines in any order. + sort <expect >expect.sorted && + sort <actual >actual.sorted && + test_cmp expect.sorted actual.sorted +' + test_done |