Re: [PATCH 3/4] Added tests for the case of merged and unmerged entries for the same file

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 20, 2014, 21:00 UTC
Message-ID: <xmqq8umiub9x.fsf@gitster.dls.corp.google.com>
In-Reply-To: <7782c581021d529947a1385939231eeb145d150e.1408533065.git.jsorianopastor@gmail.com>

Jaime Soriano Pastor <jsorianopastor@gmail.com> writes:

> Signed-off-by: Jaime Soriano Pastor <jsorianopastor@gmail.com>
> ---
>  t/t9904-unmerged-file-with-merged-entry.sh | 86 ++++++++++++++++++++++++++++++

Isn't this number already used for another test? A test on the index probably belongs to t2XXX or t3XXX family.

Show 25 quoted lines

>  1 file changed, 86 insertions(+)
>  create mode 100755 t/t9904-unmerged-file-with-merged-entry.sh
>
> diff --git a/t/t9904-unmerged-file-with-merged-entry.sh b/t/t9904-unmerged-file-with-merged-entry.sh
> new file mode 100755
> index 0000000..945bc1c
> --- /dev/null
> +++ b/t/t9904-unmerged-file-with-merged-entry.sh
> @@ -0,0 +1,86 @@
> +#!/bin/sh
> +
> +test_description='Operations with unmerged files with merged entries'
> +
> +. ./test-lib.sh
> +
> +setup_repository() {
> +	test_commit A conflict A
> +	test_commit A conflict2 A2 branchbase
> +	test_commit B conflict B
> +	test_commit B conflict2 B2
> +	git checkout branchbase -b branch1
> +	test_commit C conflict C
> +	test_commit C conflict2 C2
> +	test_commit something otherfile otherfile
> +}

No error is checked here?

Show 7 quoted lines

> +setup_stage_state() {
> +	git checkout -f HEAD
> +	{
> +		git ls-files -s conflict conflict2
> +		git merge master > /dev/null
> +		git ls-files -s conflict conflict2
> +	} > index

No error is checked here?

Style: no SP between redirection operator and its target, i.e.

	git merge master >/dev/null
	{ ... } >index

> +	cat index | git update-index --index-info

Do not cat a single file into a pipeline, i.e.

	git update-index --index-info <index

Thanks.