On Tue, Aug 17, 2021 at 05:08:39PM +0000, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee <dstolee@xxxxxxxxxxxxx> > > The sparse index will be compatible with the ORT merge strategy, so > let's use it explicitly in our tests. > > Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> > --- > t/t1092-sparse-checkout-compatibility.sh | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh > index ddc86bb4152..3e01e70fa0b 100755 > --- a/t/t1092-sparse-checkout-compatibility.sh > +++ b/t/t1092-sparse-checkout-compatibility.sh > @@ -7,6 +7,11 @@ GIT_TEST_SPARSE_INDEX= > > . ./test-lib.sh > > +# Force the use of the ORT merge algorithm until testing with the > +# recursive strategy. We expect ORT to be used with sparse-index. > +GIT_TEST_MERGE_ALGORITHM=ort > +export GIT_TEST_MERGE_ALGORITHM > + Looks good, but are the lower hunks which set `-s ort` necessary, too? I applied this series into my tree and t1092 still passes after reverting the next two hunks. Not worth a reroll on its own, just curious. Thanks, Taylor
