Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 9, 2018, 17:53 UTC
Message-ID: <xmqqr2kce1mw.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180701041122.8753-1-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 12 quoted lines

> SPOILER ALERT: This series contains answers to the "fun puzzle" at
>   https://public-inbox.org/git/CABPp-BFc1OLYKzS5rauOehvEugPc0oGMJp-NMEAmVMW7QR=4Eg@mail.gmail.com/
>
> When a merge succeeds, we expect the resulting contents to depend only
> upon the trees and blobs of the branches involved and of their merge
> base(s).  Unfortunately, there are currently about half a dozen cases
> where the contents of a "successful" merge depend on the relative
> commit timestamps of the merge bases.  Document these with testcases.
>
> (This series came out of looking at modifying how file collision
> conflict types are handled, as discussed at [1].  I discovered these
> issues while working on that topic.)

I have a topic branch for this series but not merged to 'pu' as test-lint gives these:

t6036-recursive-corner-cases.sh:1222: error: "export FOO=bar" is not portable (please use FOO=bar && export FOO): echo "export PATH=~/bin:$PATH" >source_me.bash && t6036-recursive-corner-cases.sh:1227: error: "export FOO=bar" is not portable (please use FOO=bar && export FOO): echo "export PATH=~/bin:$PATH" >source_me.bash && Makefile:77: recipe for target 'test-lint-shell-syntax' failed make: *** [test-lint-shell-syntax] Error 1

Arguably these are false positives because "source_me.bash" file is a mere payload to go through the merge process to be munged and we never intend to actually execute its contents with bash, but then the test payload probably does not even have to be a string that triggers such a false positive to begin with ;-)