diff options
Diffstat (limited to 'third_party/git/t/t3512-cherry-pick-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t3512-cherry-pick-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t3512-cherry-pick-submodule.sh b/third_party/git/t/t3512-cherry-pick-submodule.sh index bd78287841ee..6ece1d85736a 100755 --- a/third_party/git/t/t3512-cherry-pick-submodule.sh +++ b/third_party/git/t/t3512-cherry-pick-submodule.sh @@ -7,7 +7,7 @@ test_description='cherry-pick can handle submodules' KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "git cherry-pick" +test_submodule_switch "cherry-pick" test_expect_success 'unrelated submodule/file conflict is ignored' ' test_create_repo sub && |