diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5607-clone-bundle.sh | 4 | ||||
| -rwxr-xr-x | t/t6020-bundle-misc.sh | 77 |
2 files changed, 75 insertions, 6 deletions
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh index 26985f4b44..425258767d 100755 --- a/t/t5607-clone-bundle.sh +++ b/t/t5607-clone-bundle.sh @@ -38,13 +38,13 @@ test_expect_success 'die if bundle file cannot be created' ' test_must_fail git bundle create adir --all ' -test_expect_failure 'bundle --stdin' ' +test_expect_success 'bundle --stdin' ' echo master | git bundle create stdin-bundle.bdl --stdin && git ls-remote stdin-bundle.bdl >output && grep master output ' -test_expect_failure 'bundle --stdin <rev-list options>' ' +test_expect_success 'bundle --stdin <rev-list options>' ' echo master | git bundle create hybrid-bundle.bdl --stdin tag && git ls-remote hybrid-bundle.bdl >output && grep master output diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh index b554538e00..6249420a80 100755 --- a/t/t6020-bundle-misc.sh +++ b/t/t6020-bundle-misc.sh @@ -242,8 +242,16 @@ test_expect_success 'create bundle with --since option' ' ' test_expect_success 'create bundle 1 - no prerequisites' ' + # create bundle from args git bundle create 1.bdl topic/1 topic/2 && + # create bundle from stdin + cat >input <<-\EOF && + topic/1 + topic/2 + EOF + git bundle create stdin-1.bdl --stdin <input && + cat >expect <<-\EOF && The bundle contains these 2 refs: <COMMIT-D> refs/heads/topic/1 @@ -256,10 +264,16 @@ test_expect_success 'create bundle 1 - no prerequisites' ' make_user_friendly_and_stable_output >actual && test_i18ncmp expect actual && - test_bundle_object_count 1.bdl 24 + git bundle verify stdin-1.bdl | + make_user_friendly_and_stable_output >actual && + test_i18ncmp expect actual && + + test_bundle_object_count 1.bdl 24 && + test_bundle_object_count stdin-1.bdl 24 ' test_expect_success 'create bundle 2 - has prerequisites' ' + # create bundle from args git bundle create 2.bdl \ --ignore-missing \ ^topic/deleted \ @@ -267,6 +281,18 @@ test_expect_success 'create bundle 2 - has prerequisites' ' ^topic/2 \ release && + # create bundle from stdin + # input has a non-exist reference: "topic/deleted" + cat >input <<-EOF && + ^topic/deleted + ^$D + ^topic/2 + EOF + git bundle create stdin-2.bdl \ + --ignore-missing \ + --stdin \ + release <input && + cat >expect <<-\EOF && The bundle contains this ref: <COMMIT-N> refs/heads/release @@ -280,7 +306,12 @@ test_expect_success 'create bundle 2 - has prerequisites' ' make_user_friendly_and_stable_output >actual && test_i18ncmp expect actual && - test_bundle_object_count 2.bdl 16 + git bundle verify stdin-2.bdl | + make_user_friendly_and_stable_output >actual && + test_i18ncmp expect actual && + + test_bundle_object_count 2.bdl 16 && + test_bundle_object_count stdin-2.bdl 16 ' test_expect_success 'fail to verify bundle without prerequisites' ' @@ -295,10 +326,15 @@ test_expect_success 'fail to verify bundle without prerequisites' ' test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 | make_user_friendly_and_stable_output >actual && + test_i18ncmp expect actual && + + test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 | + make_user_friendly_and_stable_output >actual && test_i18ncmp expect actual ' test_expect_success 'create bundle 3 - two refs, same object' ' + # create bundle from args git bundle create --version=3 3.bdl \ ^release \ ^topic/1 \ @@ -306,6 +342,16 @@ test_expect_success 'create bundle 3 - two refs, same object' ' main \ HEAD && + # create bundle from stdin + cat >input <<-\EOF && + ^release + ^topic/1 + ^topic/2 + EOF + git bundle create --version=3 stdin-3.bdl \ + --stdin \ + main HEAD <input && + cat >expect <<-\EOF && The bundle contains these 2 refs: <COMMIT-P> refs/heads/main @@ -319,10 +365,16 @@ test_expect_success 'create bundle 3 - two refs, same object' ' make_user_friendly_and_stable_output >actual && test_i18ncmp expect actual && - test_bundle_object_count 3.bdl 4 + git bundle verify stdin-3.bdl | + make_user_friendly_and_stable_output >actual && + test_i18ncmp expect actual && + + test_bundle_object_count 3.bdl 4 && + test_bundle_object_count stdin-3.bdl 4 ' test_expect_success 'create bundle 4 - with tags' ' + # create bundle from args git bundle create 4.bdl \ ^main \ ^release \ @@ -330,6 +382,18 @@ test_expect_success 'create bundle 4 - with tags' ' ^topic/2 \ --all && + # create bundle from stdin + cat >input <<-\EOF && + ^main + ^release + ^topic/1 + ^topic/2 + EOF + git bundle create stdin-4.bdl \ + --ignore-missing \ + --stdin \ + --all <input && + cat >expect <<-\EOF && The bundle contains these 3 refs: <TAG-1> refs/tags/v1 @@ -342,7 +406,12 @@ test_expect_success 'create bundle 4 - with tags' ' make_user_friendly_and_stable_output >actual && test_i18ncmp expect actual && - test_bundle_object_count 4.bdl 3 + git bundle verify stdin-4.bdl | + make_user_friendly_and_stable_output >actual && + test_i18ncmp expect actual && + + test_bundle_object_count 4.bdl 3 && + test_bundle_object_count stdin-4.bdl 3 ' test_expect_success 'clone from bundle' ' |