diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2013-06-06 23:11:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 09:41:42 -0700 |
| commit | 00b8be5a4d383be1f4b6d0c083d3d4b10f38444b (patch) | |
| tree | 4530ad40b2eb50ab3c41c56d6029fcb8d48ea155 /t/t3401-rebase-partial.sh | |
| parent | 5b5e1c7c7875bcaed7e640dd0d33de3dbe87e1bb (diff) | |
| download | git-00b8be5a4d383be1f4b6d0c083d3d4b10f38444b.tar.gz | |
add tests for rebasing of empty commits
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3401-rebase-partial.sh')
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 58f4823783..7ba17974c5 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -42,28 +42,4 @@ test_expect_success 'rebase --merge topic branch that was partially merged upstr test_path_is_missing .git/rebase-merge ' -test_expect_success 'rebase ignores empty commit' ' - git reset --hard A && - git commit --allow-empty -m empty && - test_commit D && - git rebase C && - test "$(git log --format=%s C..)" = "D" -' - -test_expect_success 'rebase --keep-empty' ' - git reset --hard D && - git rebase --keep-empty C && - test "$(git log --format=%s C..)" = "D -empty" -' - -test_expect_success 'rebase --keep-empty keeps empty even if already in upstream' ' - git reset --hard A && - git commit --allow-empty -m also-empty && - git rebase --keep-empty D && - test "$(git log --format=%s A..)" = "also-empty -D -empty" -' - test_done |