Re: [PATCH v2] merge-recursive: restore accidentally dropped setting of path

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 4, 2019, 21:33 UTC
Message-ID: <xmqqzhmxrq66.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190604210754.GT951@szeder.dev>

SZEDER Gábor <szeder.dev@gmail.com> writes:

Show 12 quoted lines

>> +		test_must_fail git merge-file \
>> +			-L "HEAD" \
>> +			-L "" \
>> +			-L "A^0" \
>> +			ours empty theirs &&
>> +		git hash-object b >actual &&
>> +		git hash-object ours >expect &&
>> +		test_cmp ours b
>
> Here, however, you only changed what test_cmp looks at, but still kept
> the two 'git hash-object' invocations, and their output will never be
> looked at.

Thanks for quickly responding to a problem report and coming up with a solution with further polishing, all.