From 00b8be5a4d383be1f4b6d0c083d3d4b10f38444b Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Thu, 6 Jun 2013 23:11:39 -0700 Subject: add tests for rebasing of empty commits Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano --- t/t3401-rebase-partial.sh | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 't/t3401-rebase-partial.sh') 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 -- cgit v1.2.1