From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 03 Feb 2014 23:10:08 GMT
Subject: Re: [PATCH 2/8] tests: add checking that combine-diff emits only correct paths
Message-ID: <xmqqzjm7bxny.fsf@gitster.dls.corp.google.com>
In-Reply-To: <9ee3e17af9a8da1f47423a74171d5cb95293f677.1391430523.git.kirr@mns.spb.ru>

Kirill Smelkov <kirr@mns.spb.ru> writes:

> where "correct paths" stands for paths that are different to all
> parents.
>
> Up until now, we were testing combined diff only on one file, or on
> several files which were all different (t4038-diff-combined.sh).
>
> As recent thinko in "simplify intersect_paths() further" showed, and
> also, since we are going to rework code for finding paths different to
> all parents, lets write at least basic tests.

Thanks.  Some nitpicks.

>
> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
> ---
>  t/t4057-diff-combined-paths.sh | 106 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 106 insertions(+)
>  create mode 100755 t/t4057-diff-combined-paths.sh
>
> diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
> new file mode 100755
> index 0000000..e6e457d
> --- /dev/null
> +++ b/t/t4057-diff-combined-paths.sh
> @@ -0,0 +1,106 @@
> +#!/bin/sh
> +
> +test_description='combined diff show only paths that are different to all parents'
> +
> +. ./test-lib.sh
> +
> +# verify that diffc.expect matches output of
> +# `git diff -c --name-only HEAD HEAD^ HEAD^2`
> +diffc_verify() {

Style: SP before (), i.e.

	diffc_verify () {

> +	git diff -c --name-only HEAD HEAD^ HEAD^2 >diffc.actual &&
> +	test_cmp diffc.expect diffc.actual
> +}
> +
> +test_expect_success 'trivial merge - combine-diff empty' '
> +	for i in `test_seq 1 9`

Style: prefer $() over ``

> +	do
> +		echo $i >$i.txt	&&
> +		git add $i.txt

Quiz.  What happens when this "git add" fails with an earlier value
of $i?

> +	done &&