mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-04 23:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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-22 13:00:55 -07:00
commit 07873ca7b0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t3401-rebase-partial.sh
View File

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