Re: [PATCH 4/4] stash -p: demonstrate failure of split with mixed y/n

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Apr 14, 2015, 20:46 UTC
Message-ID: <CAPig+cQSyjNSxixEOVjR1CTTzPfT5kT9sbdGMLa1n3K_1zEHfA@mail.gmail.com>
In-Reply-To: <1429011168-23216-5-git-send-email-Matthieu.Moy@imag.fr>

On Tue, Apr 14, 2015 at 7:32 AM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:

Show 30 quoted lines

> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
> diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
> index 0f8f47f..6f053ff 100755
> --- a/t/t3904-stash-patch.sh
> +++ b/t/t3904-stash-patch.sh
> @@ -81,4 +81,30 @@ test_expect_success 'none of this moved HEAD' '
>         verify_saved_head
>  '
>
> +test_expect_failure 'stash -p with split hunk' '
> +       git reset --hard &&
> +       cat >test <<-\EOF &&
> +       aaa
> +       bbb
> +       ccc
> +       EOF
> +       git add test &&
> +       git commit -m "initial" &&
> +       cat >test <<-\EOF &&
> +       aaa
> +       added line 1
> +       bbb
> +       added line 2
> +       ccc
> +       EOF
> +       for a in s n y q
> +       do
> +               echo $a
> +       done |

Simplified:

    printf '%s\n' s n y q |

Show 9 quoted lines

> +       test_might_fail git stash -p 2>error &&
> +       ! test_must_be_empty error &&
> +       grep "added line 1" test &&
> +       ! grep "added line 2" test
> +'
> +
>  test_done
> --
> 2.4.0.rc1.42.g9642cc6