{"thread":{"id":"36689","subject":"[PATCH] rebase --keep-empty -i: add test","startedAt":"2014-05-18T20:28:39Z","lastAt":"2014-05-18T23:18:49Z","messageCount":2,"participants":["Michael S. Tsirkin","Neil Horman"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"242090","messageId":"1400444838-12685-1-git-send-email-mst@redhat.com","threadId":"36689","inReplyTo":null,"subject":"[PATCH] rebase --keep-empty -i: add test","fromName":"Michael S. Tsirkin","fromEmail":"mst@redhat.com","sentAt":"2014-05-18T20:28:39Z","receivedAt":"2014-05-18T20:28:39Z","isPatch":true,"sender":{"key":"mst@kernel.org","avatar":null},"body":"There's some special code in rebase -i to deal\nwith --keep-empty.\nAdd test for this combination.\n\nSigned-off-by: Michael S. Tsirkin <mst@redhat.com>\n---\n t/t3404-rebase-interactive.sh | 9 +++++++++\n 1 file changed, 9 insertions(+)\n\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex c0023a5..3b1b863 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -67,6 +67,14 @@ test_expect_success 'setup' '\n SHELL=\n export SHELL\n \n+test_expect_success 'rebase --keep-empty' '\n+\tgit checkout -b emptybranch master &&\n+\tgit commit --allow-empty -m \"empty\" &&\n+\tgit rebase --keep-empty -i HEAD~2 &&\n+\tgit log --oneline >actual &&\n+\ttest_line_count = 6 actual\n+'\n+\n test_expect_success 'rebase -i with the exec command' '\n \tgit checkout master &&\n \t(\n-- \nMST\n"},{"id":"242133","messageId":"20140518231849.GA9149@neilslaptop.think-freely.org","threadId":"36689","inReplyTo":"1400444838-12685-1-git-send-email-mst@redhat.com","subject":"Re: [PATCH] rebase --keep-empty -i: add test","fromName":"Neil Horman","fromEmail":"nhorman@tuxdriver.com","sentAt":"2014-05-18T23:18:49Z","receivedAt":"2014-05-18T23:18:49Z","isPatch":true,"sender":{"key":"nhorman@tuxdriver.com","avatar":"https://avatars.githubusercontent.com/u/1032926?v=4"},"body":"On Sun, May 18, 2014 at 11:28:39PM +0300, Michael S. Tsirkin wrote:\n> There's some special code in rebase -i to deal\n> with --keep-empty.\n> Add test for this combination.\n> \n> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>\nAcked-by: Neil Horman <nhorman@tuxdriver.com>\n\n> ---\n>  t/t3404-rebase-interactive.sh | 9 +++++++++\n>  1 file changed, 9 insertions(+)\n> \n> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\n> index c0023a5..3b1b863 100755\n> --- a/t/t3404-rebase-interactive.sh\n> +++ b/t/t3404-rebase-interactive.sh\n> @@ -67,6 +67,14 @@ test_expect_success 'setup' '\n>  SHELL=\n>  export SHELL\n>  \n> +test_expect_success 'rebase --keep-empty' '\n> +\tgit checkout -b emptybranch master &&\n> +\tgit commit --allow-empty -m \"empty\" &&\n> +\tgit rebase --keep-empty -i HEAD~2 &&\n> +\tgit log --oneline >actual &&\n> +\ttest_line_count = 6 actual\n> +'\n> +\n>  test_expect_success 'rebase -i with the exec command' '\n>  \tgit checkout master &&\n>  \t(\n> -- \n> MST\n> \n"}]}