Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 11, 2015, 21:52 UTC
Message-ID: <xmqqbnd8zks9.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CANoM8SUGmb=fSFqF4DTuW2F5oPVaim-=SP76rqwwqtzcsNQf=g@mail.gmail.com>

Mike Rappazzo <rappazzo@gmail.com> writes:

Show 17 quoted lines

> On Fri, Sep 11, 2015 at 12:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Michael Rappazzo <rappazzo@gmail.com> writes:
>>
>>> The code formerly in branch.c was largely the basis of the
>>> get_worktree_list implementation is now moved to worktree.c,
>>> and the find_shared_symref implementation has been refactored
>>> to use get_worktree_list
>>>
>>
>> Copying the bulk of the function in 1/3 and then removing the
>> original here made it somewhat hard to compare what got changed in
>> the implementation.
>>
>> I _think_ the code structure in the end result is more or less
>> right, though.
>
> Should I squash these first two commits together in the next series?

Mashing the two into one patch would not help anybody, I would suspect.

I didn't try this myself, but if I were doing this and if I were aiming for perfection, then I would probably try to split it even finer. Refactor the original while both the callers and the helpers are still inside branch.c (hence the early steps in the series will not benefit worktree.c at all---worktree.c may not even exist in them yet), move refactored helpers to worktree.[ch] (and at this step you may not even have get_worktree() etc. yet), and then use that refactored helper while writing new functions in worktree.c.