Merge 'gvfs/midx-fix-flakey-offset-test'

The MIDX selects between duplicate copies of objects by selecting the
most-recently-modified pack-file. This modified time is stored in
seconds, so if t5319-midx.sh runs quickly, the IDX containing the 64-bit
offsets may have the same modified time as the IDX files created
earlier. This can create test failures because we do not create the
large offset chunk if our MIDX write does not pick the corrupted IDX
file.

Remove this issue from possibility by only having one IDX file in the
64-bit test.

Signed-off-by: Derrick Stolee <[email protected]>

Author: dscho

t/t5319-midx.sh

@@ -228,17 +228,19 @@ test_expect_success 'force some 64-bit offsets with pack-objects' '
 	pack64=$(git pack-objects --index-version=2,0x40 test-64 <obj-list) &&
 	idx64=$(ls test-64-*idx) &&
 	chmod u+w $idx64 &&
-	corrupt_data $idx64 2863 "\02" &&
-	midx64=$(git midx --write --pack-dir .) &&
-	git midx --read --pack-dir . --midx-id=$midx64 >midx-read-out-64 &&
-	echo "header: 4d494458 80000001 01 14 00 06 0000000e" >midx-read-expect-64 &&
-	echo "num_objects: 77" >>midx-read-expect-64 &&
+	mkdir packs-64 &&
+	mv test-64* packs-64/ &&
+	corrupt_data packs-64/$idx64 2863 "\02" &&
+	midx64=$(git midx --write --pack-dir packs-64) &&
+	git midx --read --pack-dir packs-64 --midx-id=$midx64 >midx-read-out-64 &&
+	echo "header: 4d494458 80000001 01 14 00 06 00000001" >midx-read-expect-64 &&
+	echo "num_objects: 65" >>midx-read-expect-64 &&
 	echo "chunks: pack_lookup pack_names oid_fanout oid_lookup object_offsets large_offsets" >>midx-read-expect-64 &&
 	echo "pack_names:" >>midx-read-expect-64 &&
-	ls test-*.pack | sort >>midx-read-expect-64 &&
-	echo "pack_dir: ." >>midx-read-expect-64 &&
+	echo test-64-$pack64.pack >>midx-read-expect-64 &&
+	echo "pack_dir: packs-64" >>midx-read-expect-64 &&
 	test_cmp midx-read-out-64 midx-read-expect-64 &&
-	rm midx-$midx64.midx test-64*
+	rm -rf packs-64
 '
 
 test_done