From: Ben Peart <peartben@xxxxxxxxx> Signed-off-by: Elijah Newren <newren@xxxxxxxxx> --- Testcase provided by Ben, so committing with him as the author. Just need a sign off from him. t/t3507-cherry-pick-conflict.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 7c5ad0862..25fac490d 100755 --- 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_cmp expect actual ' +test_expect_failure 'failed cherry-pick with sparse-checkout' ' + pristine_detach initial && + git config core.sparseCheckout true && + 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 && + rm .git/info/sparse-checkout +' + test_done -- 2.18.0.234.g2d1e6cefb
