diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:36:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:36:06 -0700 |
| commit | 075652953772dbabd01d471a4c73200b0ab5d8a6 (patch) | |
| tree | daaeee8c03641b1892f403c25781afa4cc4e51d3 | |
| parent | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' (diff) | |
| parent | rebase --keep-empty -i: add test (diff) | |
| download | tgif-075652953772dbabd01d471a4c73200b0ab5d8a6.tar.xz | |
Merge branch 'mt/rebase-i-keep-empty-test'
* mt/rebase-i-keep-empty-test:
rebase --keep-empty -i: add test
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c0023a5b4f..8197ed29a9 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -67,6 +67,14 @@ test_expect_success 'setup' ' SHELL= export SHELL +test_expect_success 'rebase --keep-empty' ' + git checkout -b emptybranch master && + git commit --allow-empty -m "empty" && + git rebase --keep-empty -i HEAD~2 && + git log --oneline >actual && + test_line_count = 6 actual +' + test_expect_success 'rebase -i with the exec command' ' git checkout master && ( |