From: Martin von Zweigbergk Date: Wed, 27 Jun 2012 16:22:01 +0000 (-0700) Subject: add test case for rebase of empty commit X-Git-Tag: v1.7.11.3~8^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b5ba7b04631a457165531405710e8a303757b01;p=git.git add test case for rebase of empty commit Signed-off-by: Junio C Hamano --- diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 7ba17974c..7f8693b92 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -42,4 +42,12 @@ 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_done