Junio, On Tue, Mar 30, 2021 at 11:04:11AM -0400, Taylor Blau wrote: I accidentally left a stray debugging line in here, and managed to skip over it when reading the range-diff. It's right... > diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh > index b4afab1dfc..031a5570c0 100755 > --- a/t/t5319-multi-pack-index.sh > +++ b/t/t5319-multi-pack-index.sh > @@ -234,6 +234,49 @@ test_expect_success 'warn on improper hash version' ' > ) > ' > > +test_expect_success 'midx picks objects from preferred pack' ' > + test_when_finished rm -rf preferred.git && > + git init --bare preferred.git && > + ( > + cd preferred.git && > + > + a=$(echo "a" | git hash-object -w --stdin) && > + b=$(echo "b" | git hash-object -w --stdin) && > + c=$(echo "c" | git hash-object -w --stdin) && > + > + # Set up two packs, duplicating the object "B" at different > + # offsets. > + # > + # Note that the "BC" pack (the one we choose as preferred) sorts > + # lexically after the "AB" pack, meaning that omitting the > + # --preferred-pack argument would cause this test to fail (since > + # the MIDX code would select the copy of "b" in the "AB" pack). > + git pack-objects objects/pack/test-AB <<-EOF && > + $a > + $b > + EOF > + bc=$(git pack-objects objects/pack/test-BC <<-EOF > + $b > + $c > + EOF > + ) && > + > + git multi-pack-index --object-dir=objects \ > + write --preferred-pack=test-BC-$bc.idx 2>err && > + test_must_be_empty err && > + > + echo hi && ...here. Would you mind fixing it up locally before applying this to next? Sorry for the trouble. Thanks, Taylor
