diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2013-06-06 23:11:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 09:41:59 -0700 |
| commit | 3f213981e44a9109d053550855dc0ae91d0287c6 (patch) | |
| tree | d6f17edd97f03d6ec585d1e0624b7e1ff6d2ceac /t/t3404-rebase-interactive.sh | |
| parent | 6a6bc5bdc4d73d0926bdbd8b65c8959583ba7911 (diff) | |
| download | git-3f213981e44a9109d053550855dc0ae91d0287c6.tar.gz git-3f213981e44a9109d053550855dc0ae91d0287c6.tar.xz | |
add tests for rebasing merged history
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index a58406d12..ffcaf027b 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -477,19 +477,11 @@ test_expect_success 'interrupted squash works as expected (case 2)' ' test $one = $(git rev-parse HEAD~2) ' -test_expect_success 'ignore patch if in upstream' ' - HEAD=$(git rev-parse HEAD) && - git checkout -b has-cherry-picked HEAD^ && +test_expect_success '--continue tries to commit, even for "edit"' ' echo unrelated > file7 && git add file7 && test_tick && git commit -m "unrelated change" && - git cherry-pick $HEAD && - EXPECT_COUNT=1 git rebase -i $HEAD && - test $HEAD = $(git rev-parse HEAD^) -' - -test_expect_success '--continue tries to commit, even for "edit"' ' parent=$(git rev-parse HEAD^) && test_tick && FAKE_LINES="edit 1" git rebase -i HEAD^ && |