Andrew's git / gitweb.git / blobdiff
?
Merge branch 'sg/test-rebase-editor-fix'
[gitweb.git] / t / t3507-cherry-pick-conflict.sh
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 45ddd81bfac1d64338f229d50a904c81386aeec6..0db166152ab9eafee7a34421c1100029bda485eb 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -392,7 +392,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
        test_cmp expect actual
 '
 
-test_expect_failure 'cherry-pick preserves sparse-checkout' '
+test_expect_success 'cherry-pick preserves sparse-checkout' '
        pristine_detach initial &&
        test_config core.sparseCheckout true &&
        test_when_finished "