Skip to content

Commit

Permalink
add test case for rebase of empty commit
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Martin von Zweigbergk authored and Junio C Hamano committed Jun 27, 2012
1 parent ac2b0e8 commit 2b5ba7b
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions t/t3401-rebase-partial.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 2b5ba7b

Please sign in to comment.