projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 8ef85694 JL |
1 | #!/bin/sh |
| 2 | ||
| 3 | test_description='reset can handle submodules' | |
| 4 | ||
| 5 | . ./test-lib.sh | |
| 6 | . "$TEST_DIRECTORY"/lib-submodule-update.sh | |
| 7 | ||
| 35b96d1d | 8 | KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 |
| 35b96d1d | 9 | |
| 17f38cb7 | 10 | test_submodule_switch_recursing_with_args "reset --keep" |
| 35b96d1d | 11 | |
| 17f38cb7 | 12 | test_submodule_forced_switch_recursing_with_args "reset --hard" |
| 35b96d1d | 13 | |
| aa06180a | 14 | test_submodule_switch "reset --keep" |
| 8ef85694 | 15 | |
| aa06180a | 16 | test_submodule_switch "reset --merge" |
| 8ef85694 | 17 | |
| aa06180a | 18 | test_submodule_forced_switch "reset --hard" |
| 8ef85694 JL |
19 | |
| 20 | test_done |