diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-05-18 23:23:35 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-05-18 23:39:35 +0300 |
| commit | 1027a5c21f1fa1ec94a9687917d9ff34eb8fb1dc (patch) | |
| tree | 8c3374c44d449c45584fbad204391e651fbb7418 | |
| parent | b8bbe15a025703dcb2b775e038176728b136af70 (diff) | |
| download | git-1027a5c21f1fa1ec94a9687917d9ff34eb8fb1dc.tar.gz | |
rebase --keep-empty -i: add test
There's some special code in rebase -i to deal
with --keep-empty.
Add test for this combination.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c0023a5b4f..3b1b86336a 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -67,6 +67,15 @@ 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 && ( |