Re: [PATCH 4/5] Add tests for git-log --merges=show|hide|only

From: Torsten Bögershausen <tboegi@web.de>
Date: Mar 22, 2015, 19:57 UTC
Message-ID: <550F1E9F.40801@web.de>
In-Reply-To: <1427048921-28677-4-git-send-email-koosha@posteo.de>

On 22.03.15 19:28, Koosha Khajehmoogahi wrote:

Show 14 quoted lines

> Signed-off-by: Koosha Khajehmoogahi <koosha@posteo.de>
> ---
>  t/t4202-log.sh | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 141 insertions(+)
> 
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 5f2b290..ab6f371 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -428,6 +428,147 @@ cat > expect <<\EOF
>  * initial
>  EOF
>  
> +cat > only_merges <<EOF

- please no space after the ">"
- please add the && at the end of the line:
cat >only_merges <<EOF &&
(And the same further down)

> +test_expect_success 'log with config log.merges=show' '
> +	git config log.merges show &&

Indent with TAB is good

> +    git log --pretty=tformat:%s >actual &&

but indent with 4 spaces not ideal, please use a TAB as well.

> +	test_cmp both_commits_merges actual &&
> +    git config --unset log.merges

Do we need the unset here? The log.merges is nicely set up before each test case, so can we drop the unset lines ? (Or do I miss something ?)