On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren <newren@xxxxxxxxx> wrote: > diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh > @@ -392,4 +392,17 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' ' > +test_expect_failure 'failed cherry-pick with sparse-checkout' ' > + pristine_detach initial && > + git config core.sparseCheckout true && Should this be test_config()? > + echo /unrelated >.git/info/sparse-checkout && > + git read-tree --reset -u HEAD && > + test_must_fail git cherry-pick -Xours picked>actual && > + test_i18ngrep ! "Changes not staged for commit:" actual && > + echo "/*" >.git/info/sparse-checkout && > + git read-tree --reset -u HEAD && > + git config core.sparseCheckout false && See question above. > + rm .git/info/sparse-checkout Should this cleanup be done by test_when_finished()? > +'
