From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sat, 08 Jun 2013 03:29:46 GMT
Subject: Re: [PATCH] tests: fix autostash
Message-ID: <CALkWK0=OdcLDCd9OonUS6kBZhA=oz3HYJT8Eiqnh1A++s5yWww@mail.gmail.com>
In-Reply-To: <1370648714-7872-1-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras wrote:
> diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
> index a5e69f3..ff370a3 100755
> --- a/t/t3420-rebase-autostash.sh
> +++ b/t/t3420-rebase-autostash.sh
> @@ -71,8 +71,7 @@ testrebase() {
>                 test_must_fail git rebase$type related-onto-branch &&
>                 test_path_is_file $dotest/autostash &&
>                 ! grep dirty file3 &&
> -               rm -rf $dotest &&
> -               git reset --hard &&
> +               git rebase --abort &&
>                 git checkout feature-branch
>         '

Incorrect.  I don't assume that --abort works yet, in this test.  It
is non-trivial to get --abort to work with autostash, and this is
tested in a separate test: see "rebase$type: --abort" in the same
file.