Re: [PATCH 0/4] Fix relative path issues in recursive submodules.

From: Stefan Beller <sbeller@google.com>
Date: Mar 31, 2016, 17:20 UTC
Message-ID: <CAGZ79kYyVJcOsWvkK=Qm0rE0hd-xTq=TPi8groynJ4Vokft74g@mail.gmail.com>
In-Reply-To: <xmqq7fgipojj.fsf@gitster.mtv.corp.google.com>

On Thu, Mar 31, 2016 at 10:04 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 20 quoted lines

> Stefan Beller <sbeller@google.com> writes:
>
>> It took me longer than expected to fix this bug.
>>
>> It comes with a test and minor refactoring and applies on top of
>> origin/sb/submodule-helper, such that it can be merged into 2.7, 2.8 as well
>> as master.
>>
>> Patch 1 is a test which fails; it has a similar layout as the
>> real failing repository Norio Nomura pointed out, but simplified to the
>> bare essentials for reproduction of the bug.
>>
>> Patch 2&3 are not strictly necessary for fixing the isseu, but it removes
>> stupid code I wrote, so the resulting code looks a little better.
>>
>> Patch 4 fixes the issue by giving more information to relative_path,
>> such that a relative path can be found in all cases.
>
> There were some minor nits, but I saw nothing glaringly wrong to
> break the topic.  Thanks for working on this.

Thanks for review and discussion, I plan on resending this series.

Currently I have the opinion to drop 2&3 (the path assumption and double safe_create_leading_dir) and send patch 1 and 4 combined as a bugfix only as that is more the spirit what we want to see for an eventual merge to maint?

The refactoring patches 2&3 can be sent later as separate patches for master, I would think.