Merge branch 'cw/no-detaching-an-unborn'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index b981572d736a1adf8da5281f31e580982e2059af..68d61480fbeee024ca463ca0d5771bdfdf980866 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' '
 '
 
 test_expect_failure 'exchange two commits with -p' '
+       git checkout H &&
        FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
        test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
        test G = $(git cat-file commit HEAD | sed -ne \$p)
@@ -323,7 +324,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
        echo resolved > file1 &&
        git add file1 &&
        git rebase --continue > output &&
-       grep "^ file1 |    2 +-$" output
+       grep "^ file1 | 2 +-$" output
 '
 
 test_expect_success 'multi-squash only fires up editor once' '
@@ -624,8 +625,38 @@ test_expect_success 'submodule rebase -i' '
        FAKE_LINES="1 squash 2 3" git rebase -i A
 '
 
+test_expect_success 'submodule conflict setup' '
+       git tag submodule-base &&
+       git checkout HEAD^ &&
+       (
+               cd sub && git checkout HEAD^ && echo 4 >elif &&
+               git add elif && git commit -m "submodule conflict"
+       ) &&
+       git add sub &&
+       test_tick &&
+       git commit -m "Conflict in submodule" &&
+       git tag submodule-topic
+'
+
+test_expect_success 'rebase -i continue with only submodule staged' '
+       test_must_fail git rebase -i submodule-base &&
+       git add sub &&
+       git rebase --continue &&
+       test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
+'
+
+test_expect_success 'rebase -i continue with unstaged submodule' '
+       git checkout submodule-topic &&
+       git reset --hard &&
+       test_must_fail git rebase -i submodule-base &&
+       git reset &&
+       git rebase --continue &&
+       test $(git rev-parse submodule-base) = $(git rev-parse HEAD)
+'
+
 test_expect_success 'avoid unnecessary reset' '
        git checkout master &&
+       git reset --hard &&
        test-chmtime =123456789 file3 &&
        git update-index --refresh &&
        HEAD=$(git rev-parse HEAD) &&
@@ -724,4 +755,121 @@ test_expect_success 'rebase-i history with funny messages' '
        test_cmp expect actual
 '
 
+
+test_expect_success 'prepare for rebase -i --exec' '
+       git checkout master &&
+       git checkout -b execute &&
+       test_commit one_exec main.txt one_exec &&
+       test_commit two_exec main.txt two_exec &&
+       test_commit three_exec main.txt three_exec
+'
+
+
+test_expect_success 'running "git rebase -i --exec git show HEAD"' '
+       git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
+       (
+               FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+               export FAKE_LINES &&
+               git rebase -i HEAD~2 >expect
+       ) &&
+       sed -e "1,9d" expect >expected &&
+       test_cmp expected actual
+'
+
+
+test_expect_success 'running "git rebase --exec git show HEAD -i"' '
+       git reset --hard execute &&
+       git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
+       (
+               FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+               export FAKE_LINES &&
+               git rebase -i HEAD~2 >expect
+       ) &&
+       sed -e "1,9d" expect >expected &&
+       test_cmp expected actual
+'
+
+
+test_expect_success 'running "git rebase -ix git show HEAD"' '
+       git reset --hard execute &&
+       git rebase -ix "git show HEAD" HEAD~2 >actual &&
+       (
+               FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+               export FAKE_LINES &&
+               git rebase -i HEAD~2 >expect
+       ) &&
+       sed -e "1,9d" expect >expected &&
+       test_cmp expected actual
+'
+
+
+test_expect_success 'rebase -ix with several <CMD>' '
+       git reset --hard execute &&
+       git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
+       (
+               FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
+               export FAKE_LINES &&
+               git rebase -i HEAD~2 >expect
+       ) &&
+       sed -e "1,9d" expect >expected &&
+       test_cmp expected actual
+'
+
+
+test_expect_success 'rebase -ix with several instances of --exec' '
+       git reset --hard execute &&
+       git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
+       (
+               FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
+                               exec_git_show_HEAD exec_pwd" &&
+               export FAKE_LINES &&
+               git rebase -i HEAD~2 >expect
+       ) &&
+       sed -e "1,11d" expect >expected &&
+       test_cmp expected actual
+'
+
+
+test_expect_success 'rebase -ix with --autosquash' '
+       git reset --hard execute &&
+       git checkout -b autosquash &&
+       echo second >second.txt &&
+       git add second.txt &&
+       git commit -m "fixup! two_exec" &&
+       echo bis >bis.txt &&
+       git add bis.txt &&
+       git commit -m "fixup! two_exec" &&
+       (
+               git checkout -b autosquash_actual &&
+               git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual
+       ) &&
+       git checkout autosquash &&
+       (
+               git checkout -b autosquash_expected &&
+               FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+               export FAKE_LINES &&
+               git rebase -i HEAD~4 >expect
+       ) &&
+       sed -e "1,13d" expect >expected &&
+       test_cmp expected actual
+'
+
+
+test_expect_success 'rebase --exec without -i shows error message' '
+       git reset --hard execute &&
+       test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
+       echo "--exec option must be used with --interactive option" >expected &&
+       test_i18ncmp expected actual
+'
+
+
+test_expect_success 'rebase -i --exec without <CMD>' '
+       git reset --hard execute &&
+       test_must_fail git rebase -i --exec 2>tmp &&
+       sed -e "1d" tmp >actual &&
+       test_must_fail git rebase -h >expected &&
+       test_cmp expected actual &&
+       git checkout master
+'
+
 test_done