Re: [PATCH] merge-recursive: do not look at the index during recursive merge

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 9, 2018, 18:25 UTC
Message-ID: <xmqq373e7uu7.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqq7esq7v4j.fsf_-_@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 9 quoted lines

> + ...
> +	test_tick &&
> +	git commit --allow-empty -m "O2" &&
> +	O1=$(git rev-parse HEAD) &&
> +
> +	git reset --hard $O0 &&
> +	test_tick &&
> +	git commit --allow-empty -m "O2" &&
> +	O2=$(git rev-parse HEAD) &&

Does not affect the validity of the test at all, but the log message of the $O1 should be made with -m "O1", not with -m "O2". That fix will be in the version I'll be queuing.

Show 14 quoted lines

> +
> +	test_tick &&
> +	git merge -s ours $O1 &&
> +	B=$(git rev-parse HEAD) &&
> +
> +	git reset --hard $O1 &&
> +	test_tick &&
> +	git merge -s ours $O2 &&
> +	A=$(git rev-parse HEAD) &&
> +
> +	git merge $B
> +'
> +
>  test_done