Sam McKelvie writes:
>> Or perhaps
>>
>> rev-parse: --show-superproject-working-tree should work during a merge
>>
>> may be more to the point. It does not hint the root cause of the
>> bug like the other one, but is more direct how the breakage would
>> have been observed by the end users.
> On Sep 28, 2018, at 11:00 AM, Junio C Hamano wrote:
>
> Sam McKelvie writes:
>
>>> Ah, that, too. I meant to correct triple ell, though ;-)
>>> ...
>>
>> I wholeheartedly approve of that plan and your tweaking commit below. Thank
>> you, Junio.
>
> Thanks for a fix. But now I re-read
Sam McKelvie writes:
>> Ah, that, too. I meant to correct triple ell, though ;-)
>> ...
>
> I wholeheartedly approve of that plan and your tweaking commit below. Thank
> you, Junio.
Thanks for a fix. But now I re-read the title and think about it,
this is mistitled. The word 'stage' in
> On Sep 27, 2018, at 6:43 PM, Junio C Hamano wrote:
>
> Sam McKelvie writes:
>
>>>> Subject: Re: [PATCH] submodule: Alllow staged changes for
>>>> get_superproject_working_tree
>>>
>>> s/Alllow/allow/;
>>>
>>
&g
Sam McKelvie writes:
>>> Subject: Re: [PATCH] submodule: Alllow staged changes for
>>> get_superproject_working_tree
>>
>> s/Alllow/allow/;
>>
>
> Ok, no caps on first letter of subject.
Ah, that, too. I meant to correct triple ell, though ;-)
W
e writes:
>
>> Subject: Re: [PATCH] submodule: Alllow staged changes for
>> get_superproject_working_tree
>
> s/Alllow/allow/;
>
Ok, no caps on first letter of subject.
>> Invoking 'git rev-parse --show-superproject-working-tree' exits with
>>
>>
Sam McKelvie writes:
> Subject: Re: [PATCH] submodule: Alllow staged changes for
> get_superproject_working_tree
s/Alllow/allow/;
> Invoking 'git rev-parse --show-superproject-working-tree' exits with
>
> "fatal: BUG: returned path string doesn't match cwd?"
>
On Thu, Sep 27, 2018 at 11:12 AM Sam McKelvie wrote:
>
> Invoking 'git rev-parse --show-superproject-working-tree' exits with
>
> "fatal: BUG: returned path string doesn't match cwd?"
>
> when the superproject has an unmerged entry for the current submodule,
> instead of displaying the
Invoking 'git rev-parse --show-superproject-working-tree' exits with
"fatal: BUG: returned path string doesn't match cwd?"
when the superproject has an unmerged entry for the current submodule,
instead of displaying the superproject's working tree.
The problem is due to the fact that when a
9 matches
Mail list logo
