Re: [PATCH v1] builtin/merge.c - cleanup of code in for-cycle that tests strategies

From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Jul 7, 2019, 03:15 UTC
Message-ID: <CAOc6etYGA_rHhrDgMbf4x_GxdWwgWy7W2Kqvv6PsMMHFP0U_vA@mail.gmail.com>
In-Reply-To: <20190707000052.26057-1-eantoranz@gmail.com>

On Sat, Jul 6, 2019 at 6:00 PM Edmundo Carmona Antoranz <eantoranz@gmail.com> wrote:

Show 8 quoted lines

> @@ -1645,6 +1631,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
>          * auto resolved the merge cleanly.
>          */
>         if (automerge_was_ok) {
> +               write_tree_trivial(&result_tree);
>                 ret = finish_automerge(head_commit, head_subsumed,
>                                        common, remoteheads,
>                                        &result_tree, wt_strategy);

I realized later that the call to write_tree_trivial could be included in finish_automerge. Will include this change on v2 of the patch (if there's a v2, depending on feedback).