Re: [PATCH v6 06/13] merge-index: don't fork if the requested program is `git-merge-one-file'

From: Martin Ågren <martin.agren@gmail.com>
Date: Jan 5, 2021, 17:35 UTC
Message-ID: <CAN0heSrOKr--GenbowHP+iwkijbg5pCeJLq+wz6NXCXTsfcvGg@mail.gmail.com>
In-Reply-To: <44c9189d-9d2f-c437-d0d6-9529708d2c99@gmail.com>

On Tue, 5 Jan 2021 at 17:13, Derrick Stolee <stolee@gmail.com> wrote:

Show 10 quoted lines

>
> On 11/24/2020 6:53 AM, Alban Gruin wrote:
> > +     if (merge_action == merge_one_file_func) {
>
> nit: This made me think it would be better to check the 'lock'
> itself to see if it was initialized or not. Perhaps
>
>         if (lock.tempfile) {
>
> would be the appropriate way to check this?

Show 9 quoted lines

> nit: this could be simplified. In total, I recommend:
>
>         if (lock.tempfile) {
>                 if (err)
>                         rollback_lock_file(&lock);
>                 else
>                         return write_locked_index(&the_index, &lock, COMMIT_LOCK);
>         }
>         return err;

FWIW, I also find that way of writing it easier to grok. Although, rather than peeking at `lock.tempfile`, I suggest using `is_lock_file_locked(&lock)`.

Martin