diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 20:00:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 20:00:55 (GMT) |
| commit | 07873ca7b02a06d3f5a9db47333062aff6f18047 (patch) | |
| tree | b7420a5143ec6c3e09a2c4e7853ef7da243da925 | |
| parent | 12d1ea21c06b49843366bd5c992d2fa79433e33f (diff) | |
| parent | 2b5ba7b04631a457165531405710e8a303757b01 (diff) | |
| download | git-07873ca7b02a06d3f5a9db47333062aff6f18047.zip git-07873ca7b02a06d3f5a9db47333062aff6f18047.tar.gz git-07873ca7b02a06d3f5a9db47333062aff6f18047.tar.bz2 | |
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
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 7ba1797..7f8693b 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -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 |