From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Dec 2020 22:06:58 GMT
Subject: Re: [PATCH v6 1/2] mergetool: add automerge configuration
Message-ID: <xmqq1rfarji5.fsf@gitster.c.googlers.com>
In-Reply-To: <20201227205835.502556-2-seth@eseth.com>

Seth House <seth@eseth.com> writes:

> ...
> See Seth House's blog post [1] for the idea, and the rationale.
>
> [1] https://www.eseth.org/2020/mergetools.html
>
> Original-idea-by: Seth House <seth@eseth.com>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---

Missing Sign-off as a relayer.

> diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
> index 70afdd06fa..b75c91199b 100755
> --- a/t/t7610-mergetool.sh
> +++ b/t/t7610-mergetool.sh
> @@ -828,4 +828,22 @@ test_expect_success 'mergetool -Oorder-file is honored' '
>  	test_cmp expect actual
>  '
>  
> +test_expect_success 'mergetool automerge' '
> +	test_config mergetool.automerge true &&
> +	test_when_finished "git reset --hard" &&
> +	git checkout -b test${test_count}_b master &&
> +	echo -e "base\n\na" >file1 &&

These do not seem to be taken from the version that has been
improved by reviwer comments after v3.

> +	git commit -a -m "base" &&
> +	echo -e "base\n\nc" >file1 &&
> +	git commit -a -m "remote update" &&
> +	git checkout -b test${test_count}_a HEAD~ &&
> +	echo -e "local\n\nb" >file1 &&
> +	git commit -a -m "local update" &&
> +	test_must_fail git merge test${test_count}_b &&
> +	yes "" | git mergetool file1 &&
> +	echo -e "local\n\nc" >expect &&
> +	test_cmp expect file1 &&
> +	git commit -m "test resolved with mergetool"
> +'
> +
>  test_done