git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] t5310: drop lib-bundle.sh include
@ 2021-10-28 19:20 Jeff King
  2021-10-29  7:04 ` Junio C Hamano
  2021-10-29 10:16 ` Ævar Arnfjörð Bjarmason
  0 siblings, 2 replies; 3+ messages in thread
From: Jeff King @ 2021-10-28 19:20 UTC (permalink / raw)
  To: git; +Cc: Ævar Arnfjörð Bjarmason

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
-- 
2.33.1.1409.g5a89a36363

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] t5310: drop lib-bundle.sh include
  2021-10-28 19:20 [PATCH] t5310: drop lib-bundle.sh include Jeff King
@ 2021-10-29  7:04 ` Junio C Hamano
  2021-10-29 10:16 ` Ævar Arnfjörð Bjarmason
  1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2021-10-29  7:04 UTC (permalink / raw)
  To: Jeff King; +Cc: git, Ævar Arnfjörð Bjarmason

Jeff King <peff@peff.net> writes:

> 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.


>
>  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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] t5310: drop lib-bundle.sh include
  2021-10-28 19:20 [PATCH] t5310: drop lib-bundle.sh include Jeff King
  2021-10-29  7:04 ` Junio C Hamano
@ 2021-10-29 10:16 ` Ævar Arnfjörð Bjarmason
  1 sibling, 0 replies; 3+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2021-10-29 10:16 UTC (permalink / raw)
  To: Jeff King; +Cc: git


On Thu, Oct 28 2021, Jeff King wrote:

> 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!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-29 10:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 19:20 [PATCH] t5310: drop lib-bundle.sh include Jeff King
2021-10-29  7:04 ` Junio C Hamano
2021-10-29 10:16 ` Ævar Arnfjörð Bjarmason

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).