From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 May 2018 05:38:11 +0000 (+0900)
Subject: Merge branch 'sg/t5310-jgit-bitmap-test'
X-Git-Tag: v2.18.0-rc0~66
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c4e7220f0873086f1f1e3dffc9b2d9964f93636b?ds=inline;hp=-c

Merge branch 'sg/t5310-jgit-bitmap-test'

Test update.

* sg/t5310-jgit-bitmap-test:
t5310-pack-bitmaps: make JGit tests work with GIT_TEST_SPLIT_INDEX
---

c4e7220f0873086f1f1e3dffc9b2d9964f93636b
diff --combined t/t5310-pack-bitmaps.sh
index f6d600fd82,1cb798ddb5..423c0a475f
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@@ -264,9 -264,9 +264,9 @@@ test_expect_success 'pack with missing 
  '
  
  test_expect_success JGIT 'we can read jgit bitmaps' '
- 	git clone . compat-jgit &&
+ 	git clone --bare . compat-jgit.git &&
  	(
- 		cd compat-jgit &&
+ 		cd compat-jgit.git &&
  		rm -f .git/objects/pack/*.bitmap &&
  		jgit gc &&
  		git rev-list --test-bitmap HEAD
@@@ -274,9 -274,9 +274,9 @@@
  '
  
  test_expect_success JGIT 'jgit can read our bitmaps' '
- 	git clone . compat-us &&
+ 	git clone --bare . compat-us.git &&
  	(
- 		cd compat-us &&
+ 		cd compat-us.git &&
  		git repack -adb &&
  		# jgit gc will barf if it does not like our bitmaps
  		jgit gc
@@@ -284,7 -284,7 +284,7 @@@
  '
  
  test_expect_success 'splitting packs does not generate bogus bitmaps' '
 -	test-genrandom foo $((1024 * 1024)) >rand &&
 +	test-tool genrandom foo $((1024 * 1024)) >rand &&
  	git add rand &&
  	git commit -m "commit with big file" &&
  	git -c pack.packSizeLimit=500k repack -adb &&