diff options
Diffstat (limited to 'third_party/git/t/t3426-rebase-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t3426-rebase-submodule.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/third_party/git/t/t3426-rebase-submodule.sh b/third_party/git/t/t3426-rebase-submodule.sh index a2bba04ba9..0ad3a07bf4 100755 --- a/third_party/git/t/t3426-rebase-submodule.sh +++ b/third_party/git/t/t3426-rebase-submodule.sh @@ -17,10 +17,11 @@ git_rebase () { git status -su >actual && ls -1pR * >>actual && test_cmp expect actual && - git rebase "$1" + may_only_be_test_must_fail "$2" && + $2 git rebase "$1" } -test_submodule_switch "git_rebase" +test_submodule_switch_func "git_rebase" git_rebase_interactive () { git status -su >expect && @@ -35,10 +36,11 @@ git_rebase_interactive () { test_cmp expect actual && set_fake_editor && echo "fake-editor.sh" >.git/info/exclude && - git rebase -i "$1" + may_only_be_test_must_fail "$2" && + $2 git rebase -i "$1" } -test_submodule_switch "git_rebase_interactive" +test_submodule_switch_func "git_rebase_interactive" test_expect_success 'rebase interactive ignores modified submodules' ' test_when_finished "rm -rf super sub" && |