Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run' into next
[git] / t / t3512-cherry-pick-submodule.sh
1 #!/bin/sh
2
3 test_description='cherry-pick can handle submodules'
4
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
7
8 KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
9 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
10 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
11 test_submodule_switch "git cherry-pick"
12
13 test_done