From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Nov 2021 20:48:08 +0000 (-0700)
Subject: Merge branch 'ab/test-lib'
X-Git-Tag: v2.34.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfd86ee3dd754bb160703f37a987f409c4ddd972;p=thirdparty%2Fgit.git

Merge branch 'ab/test-lib'

Test (cosmetic) fix.

* ab/test-lib:
  t5310: drop lib-bundle.sh include
---

cfd86ee3dd754bb160703f37a987f409c4ddd972
diff --cc t/t5310-pack-bitmaps.sh
index 673baa5c3c,4703ec36b2..dcf03d324a
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@@ -5,13 -5,8 +5,12 @@@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=ma
  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
 +# their place.
 +GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
 +
  objpath () {
  	echo ".git/objects/$(echo "$1" | sed -e 's|\(..\)|\1/|')"
  }