threads / patch / 56803

patcht5310: drop lib-bundle.sh include

Subject: [PATCH] t5310: drop lib-bundle.sh include

## tl;dr

3 messages between Oct 28, 2021 and Oct 29, 2021. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Jeff King· Oct 28, 2021, 19:20 UTC · lore

Commit ddfe900612 (test-lib-functions: move function to lib-bitmap.sh, 2021-02-09) meant to include lib-bitmap.sh in t5310, but also includes lib-bundle.sh. Yet we don't use any of its functions, nor have anything to do with bundles. This is probably just a typo/copy-paste error, as lib-bundle.sh was added (correctly) to other scripts in the same series.

Signed-off-by: Jeff King <peff@peff.net>
---
Not really hurting anything, just confusing.

 t/t5310-pack-bitmaps.sh | 1 -
 1 file changed, 1 deletion(-)

Show changes to t/t5310-pack-bitmaps.sh +0 −1

diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 673baa5c3c..dcf03d324a 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -5,7 +5,6 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-bundle.sh
 . "$TEST_DIRECTORY"/lib-bitmap.sh
 
 # t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in

-- 
2.33.1.1409.g5a89a36363

Junio C Hamano· Oct 29, 2021, 07:04 UTC · re: Jeff King · lore

Re: [PATCH] t5310: drop lib-bundle.sh include

Jeff King <peff@peff.net> writes:

Show 9 quoted lines

> Commit ddfe900612 (test-lib-functions: move function to lib-bitmap.sh,
> 2021-02-09) meant to include lib-bitmap.sh in t5310, but also includes
> lib-bundle.sh. Yet we don't use any of its functions, nor have anything
> to do with bundles. This is probably just a typo/copy-paste error, as
> lib-bundle.sh was added (correctly) to other scripts in the same series.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Not really hurting anything, just confusing.

Makes sense to me.

Will queue; thanks.

Show 16 quoted lines

>
>  t/t5310-pack-bitmaps.sh | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
> index 673baa5c3c..dcf03d324a 100755
> --- a/t/t5310-pack-bitmaps.sh
> +++ b/t/t5310-pack-bitmaps.sh
> @@ -5,7 +5,6 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
>  export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
>  
>  . ./test-lib.sh
> -. "$TEST_DIRECTORY"/lib-bundle.sh
>  . "$TEST_DIRECTORY"/lib-bitmap.sh
>  
>  # t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in

Ævar Arnfjörð Bjarmason· Oct 29, 2021, 10:16 UTC · re: Jeff King · lore

Re: [PATCH] t5310: drop lib-bundle.sh include

On Thu, Oct 28 2021, Jeff King wrote:

Show 25 quoted lines

> Commit ddfe900612 (test-lib-functions: move function to lib-bitmap.sh,
> 2021-02-09) meant to include lib-bitmap.sh in t5310, but also includes
> lib-bundle.sh. Yet we don't use any of its functions, nor have anything
> to do with bundles. This is probably just a typo/copy-paste error, as
> lib-bundle.sh was added (correctly) to other scripts in the same series.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Not really hurting anything, just confusing.
>
>  t/t5310-pack-bitmaps.sh | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
> index 673baa5c3c..dcf03d324a 100755
> --- a/t/t5310-pack-bitmaps.sh
> +++ b/t/t5310-pack-bitmaps.sh
> @@ -5,7 +5,6 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
>  export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
>  
>  . ./test-lib.sh
> -. "$TEST_DIRECTORY"/lib-bundle.sh
>  . "$TEST_DIRECTORY"/lib-bitmap.sh
>  
>  # t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in

Thanks for cleaning that up, yes that wasn't intentional, but just some copy/paste programming or something that managed to escape me & the list. Thanks!