From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 01 Jan 2022 20:11:39 GMT
Subject: Re: [PATCH 2/8] merge-tree: move logic for existing merge into new function
Message-ID: <20220101201139.elxj76zr2ihrjkdr@gmail.com>
In-Reply-To: <9da8e77c1d7c3645fdad74080c0093f420dcfef4.1640927044.git.gitgitgadget@gmail.com>

On Fri, Dec 31, 2021 at 05:03:58AM +0000, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> In preparation for adding a non-trivial merge capability to merge-tree,
> move the existing merge logic for trivial merges into a new function.
> 
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  builtin/merge-tree.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
> index 06f9eee9f78..9fe5b99f623 100644
> --- a/builtin/merge-tree.c
> +++ b/builtin/merge-tree.c
> @@ -366,15 +366,11 @@ static void *get_tree_descriptor(struct repository *r,
>  	return buf;
>  }
>  
> -int cmd_merge_tree(int argc, const char **argv, const char *prefix)
> -{
> +static int trivial_merge(int argc, const char **argv) {

I guess the brace should probably stay on its own line