diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:08:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:08:48 -0700 |
| commit | ef66ac3ead836c272b20550b09dad7def6084560 (patch) | |
| tree | f59d615e11383d108e919b88b72f7118e7e93b11 | |
| parent | 515cd1913c17c0fca2e52434d118257ea105c3ec (diff) | |
| parent | 25428403448602a19116dc271f000a3735c6779b (diff) | |
| download | git-ef66ac3ead836c272b20550b09dad7def6084560.tar.gz git-ef66ac3ead836c272b20550b09dad7def6084560.tar.xz | |
Merge branch 'mz/empty-rebase-test' into maint-1.7.11
* mz/empty-rebase-test:
add tests for 'git rebase --keep-empty'
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 7f8693b92..58f482378 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -47,7 +47,23 @@ test_expect_success 'rebase ignores empty commit' ' git commit --allow-empty -m empty && test_commit D && git rebase C && - test $(git log --format=%s C..) = "D" + test "$(git log --format=%s C..)" = "D" +' + +test_expect_success 'rebase --keep-empty' ' + git reset --hard D && + git rebase --keep-empty C && + test "$(git log --format=%s C..)" = "D +empty" +' + +test_expect_success 'rebase --keep-empty keeps empty even if already in upstream' ' + git reset --hard A && + git commit --allow-empty -m also-empty && + git rebase --keep-empty D && + test "$(git log --format=%s A..)" = "also-empty +D +empty" ' test_done |