commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7304b663c31992de232736a3d9201bb878d2c6f4..32fdc9938e1dc29d9a1c6c1dd54379ee33644561 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -118,6 +118,17 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
        git rebase --continue
 '
 
+test_expect_success 'rebase -i with exec of inexistent command' '
+       git checkout master &&
+       test_when_finished "git rebase --abort" &&
+       (
+       FAKE_LINES="exec_this-command-does-not-exist 1" &&
+       export FAKE_LINES &&
+       test_must_fail git rebase -i HEAD^ >actual 2>&1
+       ) &&
+       ! grep "Maybe git-rebase is broken" actual
+'
+
 test_expect_success 'no changes are a nop' '
        git checkout branch2 &&
        git rebase -i F &&
@@ -911,4 +922,22 @@ test_expect_success 'rebase -i --root fixup root commit' '
        test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
 '
 
+test_expect_success 'rebase --edit-todo does not works on non-interactive rebase' '
+       git reset --hard &&
+       git checkout conflict-branch &&
+       test_must_fail git rebase --onto HEAD~2 HEAD~ &&
+       test_must_fail git rebase --edit-todo &&
+       git rebase --abort
+'
+
+test_expect_success 'rebase --edit-todo can be used to modify todo' '
+       git reset --hard &&
+       git checkout no-conflict-branch^0 &&
+       FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
+       FAKE_LINES="2 1" git rebase --edit-todo &&
+       git rebase --continue
+       test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+       test L = $(git cat-file commit HEAD | sed -ne \$p)
+'
+
 test_done