Skip to content

Commit

Permalink
Merge branch 'mz/empty-rebase-test'
Browse files Browse the repository at this point in the history
We did not have test to make sure "git rebase" without extra options
filters out an empty commit in the original history.

* mz/empty-rebase-test:
  add test case for rebase of empty commit
  • Loading branch information
Junio C Hamano committed Jul 9, 2012
2 parents faae885 + 2b5ba7b commit 69833ba
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 69833ba

Please sign in to comment.