]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/test-lib'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Nov 2021 20:48:08 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Nov 2021 20:48:08 +0000 (13:48 -0700)
Test (cosmetic) fix.

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

1  2 
t/t5310-pack-bitmaps.sh

index 673baa5c3ccc8a44948280337d55fa67fd28f324,4703ec36b2917896985f1d86e2b1c852fa27c6c8..dcf03d324a25a4bdc14156c6b53c5442f9c3d83b
@@@ -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/|')"
  }