diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-23 14:53:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-23 14:53:27 -0700 |
| commit | 8ff80a2f0514080a741c19532a094f1fa79dc8e2 (patch) | |
| tree | e486e0e10e4203a850e6c395f7119ed913677ca3 /t/t3404-rebase-interactive.sh | |
| parent | ee64e345b1ac13cbb9c6a2343453fa3fc798367a (diff) | |
| parent | 984f78d278dd456b12874da1bdf3763e72db8dae (diff) | |
| download | git-8ff80a2f0514080a741c19532a094f1fa79dc8e2.tar.gz | |
Merge branch 'mz/rebase-tests'
* mz/rebase-tests:
rebase topology tests: fix commit names on case-insensitive file systems
tests: move test for rebase messages from t3400 to t3406
t3406: modernize style
add tests for rebasing merged history
add tests for rebasing root
add tests for rebasing of empty commits
add tests for rebasing with patch-equivalence present
add simple tests of consistency across rebase types
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 79e8d3c596..0d3c57340e 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^ && |