| test_description='rebase can handle submodules' |
| . "$TEST_DIRECTORY"/lib-submodule-update.sh |
| . "$TEST_DIRECTORY"/lib-rebase.sh |
| git status -su >expect && |
| git checkout -b ours HEAD && |
| git status -su >actual && |
| test_cmp expect actual && |
| test_submodule_switch "git_rebase" |
| git_rebase_interactive () { |
| git status -su >expect && |
| git checkout -b ours HEAD && |
| git status -su >actual && |
| test_cmp expect actual && |
| echo "fake-editor.sh" >.git/info/exclude && |
| KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 |
| # The real reason "replace directory with submodule" fails is because a |
| # directory "sub1" exists, but we reuse the suppression added for merge here |
| test_submodule_switch "git_rebase_interactive" |