diff options
| author |  Andrew Wong <andrew.kw.w@gmail.com> | 2012-09-17 21:28:10 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-09-17 20:59:18 -0700 |
| commit | 9f4981bac6f492d332785b8ed03f33a167952f38 (patch) | |
| tree | 0c09dc1fc14ef72d9e5f9b881f36dc5acd63f9dd | |
| parent | rebase -i: Teach "--edit-todo" action (diff) | |
| download | tgif-9f4981bac6f492d332785b8ed03f33a167952f38.tar.xz | |
rebase -i: Add tests for "--edit-todo"
Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7304b663c3..6eafb63465 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -911,4 +911,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 |