Re: [PATCH] rebase --keep-empty -i: add test
From: Neil Horman <nhorman@tuxdriver.com>
Date: 2016-06-15 23:01:14
On Sun, May 18, 2014 at 11:28:39PM +0300, Michael S. Tsirkin wrote:
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>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
quoted hunk ↗ jump to hunk
--- t/t3404-rebase-interactive.sh | 9 +++++++++ 1 file changed, 9 insertions(+)diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c0023a5..3b1b863 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 && (-- MST