* [PATCH] rebase --keep-empty -i: add test
@ 2014-05-18 20:28 Michael S. Tsirkin
2014-05-18 23:18 ` Neil Horman
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2014-05-18 20:28 UTC (permalink / raw)
To: git; +Cc: nhorman
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rebase --keep-empty -i: add test
2014-05-18 20:28 [PATCH] rebase --keep-empty -i: add test Michael S. Tsirkin
@ 2014-05-18 23:18 ` Neil Horman
0 siblings, 0 replies; 2+ messages in thread
From: Neil Horman @ 2014-05-18 23:18 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: git
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>
> ---
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-18 23:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-18 20:28 [PATCH] rebase --keep-empty -i: add test Michael S. Tsirkin
2014-05-18 23:18 ` Neil Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).