From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 06 Mar 2014 21:27:03 GMT
Subject: Re: [PATCH 5/6] merge hook tests: fix missing '&&' in test
Message-ID: <xmqqmwh3vx08.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1394117424-29780-6-git-send-email-benoit.pierre@gmail.com>

Benoit Pierre <benoit.pierre@gmail.com> writes:

> Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
> ---

Please have these preparatory fix-ups (i.e. the changes that would
be immediately useful even if it turns out that the main body of the
series were not ready for inclusion) early in the series, not late
as 5th patch of a 6 patch series.

Thanks.

>  t/t7505-prepare-commit-msg-hook.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
> index ae7b2db..604c06e 100755
> --- a/t/t7505-prepare-commit-msg-hook.sh
> +++ b/t/t7505-prepare-commit-msg-hook.sh
> @@ -189,7 +189,7 @@ test_expect_success 'with failing hook (merge)' '
>  	git add file &&
>  	rm -f "$HOOK" &&
>  	git commit -m other &&
> -	write_script "$HOOK" <<-EOF
> +	write_script "$HOOK" <<-EOF &&
>  	exit 1
>  	EOF
>  	git checkout - &&