Merge branch 'mz/empty-rebase-test'

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
This commit is contained in:
Junio C Hamano 2012-07-09 09:02:15 -07:00
Родитель faae8854bf 2b5ba7b046
Коммит 69833baa04
1 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -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