"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > Patch to resolve textual and semantic conflict with > ds/sparse-checkout-requires-per-worktree-config: > > diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh > remerge CONFLICT (content): Merge conflict in t/t1091-sparse-checkout-builtin.sh > index 3c6adeb885..3a95d2996d 100755 > --- a/t/t1091-sparse-checkout-builtin.sh > +++ b/t/t1091-sparse-checkout-builtin.sh > @@ -275,24 +275,8 @@ test_expect_success 'sparse-index enabled and disabled' ' > diff -u sparse full | tail -n +3 >actual && > test_cmp expect actual && > > -<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 286c22e5ec (sparse-checkout: reject arguments in cone-mode that look like patterns) > git -C repo config --list >config && > - ! grep index.sparse config > -|||||||||||||||||||||||||||||||| 89bece5c8c > - diff -u sparse full | tail -n +3 >actual && > - test_cmp expect actual && > - > - git -C repo config --list >config && > - ! grep index.sparse config > - ) > -================================ > - diff -u sparse full | tail -n +3 >actual && > - test_cmp expect actual && > - > - git -C repo config --list >config && > - test_cmp_config -C repo false index.sparse > - ) > ->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 3ce1138272 (config: make git_configset_get_string_tmp() private) > + test_cmp_config -C repo false index.sparse > ' The above is quite straight-forward. > test_expect_success 'cone mode: init and set' ' > @@ -532,6 +516,7 @@ test_expect_success 'reapply can handle config options' ' > cat >expect <<-\EOF && > core.sparsecheckout=true > core.sparsecheckoutcone=true > + index.sparse=false > EOF > test_cmp expect actual && > > @@ -539,6 +524,8 @@ test_expect_success 'reapply can handle config options' ' > git -C repo config --worktree --list >actual && > cat >expect <<-\EOF && > core.sparsecheckout=true > + core.sparsecheckoutcone=false > + index.sparse=false > EOF > test_cmp expect actual && These differences are a bit nasty, but of course understandable once it is shown X-<. Thanks.
