Browse Source

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
maint
Junio C Hamano 13 years ago
parent
commit
69833baa04
  1. 8
      t/t3401-rebase-partial.sh

8
t/t3401-rebase-partial.sh

@ -42,4 +42,12 @@ test_expect_success 'rebase --merge topic branch that was partially merged upstr @@ -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

Loading…
Cancel
Save