Junio C Hamano  committed 07873ca Merge

Merge branch 'mz/empty-rebase-test' into maint

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

  • Participants
  • Parent commits 12d1ea2, 2b5ba7b

Comments (0)

Files changed (1)

File t/

 	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"