From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 05 Jul 2015 15:38:25 GMT
Subject: Re: [PATCH 02/12] t4150: am fails if index is dirty
Message-ID: <eb790f13314192dcf4787c54d4cd3cfb@www.dscho.org>
In-Reply-To: <1435861000-25278-3-git-send-email-pyokagan@gmail.com>

Hi Paul,

On 2015-07-02 20:16, Paul Tan wrote:

> diff --git a/t/t4150-am.sh b/t/t4150-am.sh
> index 3f54bdf..0a19136 100755
> --- a/t/t4150-am.sh
> +++ b/t/t4150-am.sh
> @@ -154,6 +154,17 @@ test_expect_success 'am applies patch correctly' '
>  	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
>  '
>  
> +test_expect_success 'am fails if index is dirty' '
> +	test_when_finished "rm -fr dirtyfile" &&

Seeing as you `git add` that file further down, how about `git rm -f dirtfile` here?

> +	rm -fr .git/rebase-apply &&
> +	git checkout -f first &&
> +	echo dirtyfile >dirtyfile &&
> +	git add dirtyfile &&
> +	test_must_fail git am patch1 &&
> +	test_path_is_dir .git/rebase-apply &&
> +	test_cmp_rev first HEAD

Ciao,
Dscho