From: Eric Sunshine <sunshine@sunshineco.com>
Date: Tue, 28 Nov 2017 06:02:36 GMT
Subject: Re: [RFC PATCH v2] builtin/worktree: enhance worktree removal
Message-ID: <CAPig+cRuR2cE9RtdOfvgzGbPVLBEtb38v24Myh9rn4zKk525yA@mail.gmail.com>
In-Reply-To: <xmqqy3mr6ocp.fsf@gitster.mtv.corp.google.com>

On Mon, Nov 27, 2017 at 11:04 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Eric Sunshine <sunshine@sunshineco.com> writes:
>> I had envisioned a simple 'goto remove_control_info' rather than extra
>> nesting or refactoring, but that's a minor point.
>
> Yes, use of goto is also a good way to avoid having to worry about
> the future evolution of the codeflow in this function.
>
> So perhaps
>
>         if (the directory is no longer there)
>                 goto cleanup;
>         if (the worktree does not validate)
>                 return -1;
>         ... the original code to (carefully) remove the
>         ... worktree itself
>
>         cleanup:
>
>         ... remove control info
>         ... free resources held in variables
>         ... return from the function
>
> is what we want?

Yes, that's what I had in mind.