From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:52 +0000 (-0700)
Subject: Merge branch 'sg/t5310-empty-input-fix'
X-Git-Tag: v2.19.0-rc0~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a15bfa517dc2b8165ca038300faef60fa66cfcc6?hp=-c

Merge branch 'sg/t5310-empty-input-fix'

Test fix.

* sg/t5310-empty-input-fix:
t5310-pack-bitmaps: fix bogus 'pack-objects to file can use bitmap' test
---

a15bfa517dc2b8165ca038300faef60fa66cfcc6
diff --combined t/t5310-pack-bitmaps.sh
index 6ee4d3f2d9,a8f530676c..557bd0d0c0
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@@ -9,7 -9,8 +9,8 @@@ objpath () 
  
  # show objects present in pack ($1 should be associated *.idx)
  list_packed_objects () {
- 	git show-index <"$1" | cut -d' ' -f2
+ 	git show-index <"$1" >object-list &&
+ 	cut -d' ' -f2 object-list
  }
  
  # has_any pattern-file content-file
@@@ -204,8 -205,8 +205,8 @@@ test_expect_success 'pack-objects to fi
  	# verify equivalent packs are generated with/without using bitmap index
  	packasha1=$(git pack-objects --no-use-bitmap-index --all packa </dev/null) &&
  	packbsha1=$(git pack-objects --use-bitmap-index --all packb </dev/null) &&
- 	list_packed_objects <packa-$packasha1.idx >packa.objects &&
- 	list_packed_objects <packb-$packbsha1.idx >packb.objects &&
+ 	list_packed_objects packa-$packasha1.idx >packa.objects &&
+ 	list_packed_objects packb-$packbsha1.idx >packb.objects &&
  	test_cmp packa.objects packb.objects
  '
  
@@@ -309,8 -310,9 +310,8 @@@ test_expect_success 'pack reuse respect
  	done &&
  	reusable_pack --honor-pack-keep >empty.pack &&
  	git index-pack empty.pack &&
 -	>expect &&
  	git show-index <empty.idx >actual &&
 -	test_cmp expect actual
 +	test_must_be_empty actual
  '
  
  test_expect_success 'pack reuse respects --local' '
@@@ -318,15 -320,17 +319,15 @@@
  	test_when_finished "mv alt.git/objects/pack/* .git/objects/pack/" &&
  	reusable_pack --local >empty.pack &&
  	git index-pack empty.pack &&
 -	>expect &&
  	git show-index <empty.idx >actual &&
 -	test_cmp expect actual
 +	test_must_be_empty actual
  '
  
  test_expect_success 'pack reuse respects --incremental' '
  	reusable_pack --incremental >empty.pack &&
  	git index-pack empty.pack &&
 -	>expect &&
  	git show-index <empty.idx >actual &&
 -	test_cmp expect actual
 +	test_must_be_empty actual
  '
  
  test_expect_success 'truncated bitmap fails gracefully' '