Re: [PATCH v4 2/2] apply: reload .gitattributes after patching it
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Aug 20, 2019, 18:32 UTC
- Message-ID
- <d59de3db-13e6-35d5-2cb1-b38dc8854c60@gmail.com>
- In-Reply-To
- <xmqqd0gzvgo3.fsf@gitster-ct.c.googlers.com>
On 20/08/2019 19:24, Junio C Hamano wrote:
Show 22 quoted lines
> Phillip Wood <phillip.wood123@gmail.com> writes: > >>>> Do you know why -m and -i aren't affected? >>> >>> I had to look, but I believe the answer is because they use the >>> sequencer, and the sequencer calls git merge-recursive as a separate >>> process, and so the writing of the tree is only done in a subprocess, >>> which can't persist state. >> >> The sequencer has been running in a single process for a while now. We >> do fork for 'git merge' sometimes when processing 'merge' commands but >> 'pick' commands are all done in a single process by calling >> do_recursive_merge(). >> >> Best Wishes >> >> Phillip >> >>> Should we move the merge-recursive code into the main process, we'll >>> likely have the same problem there. > > So we actually have the same issue already?
I don't think so, I modified Brian's test to call 'rebase -i' and it passes but no one seems to know why.
Best Wishes
Phillip