Re: Improving merge failure message

From: Alex Riesen <raa.lkml@gmail.com>
Date: Sep 8, 2009, 09:11 UTC
Message-ID: <81b0412b0909080211k19470327x97b19eb0bd6ab700@mail.gmail.com>
In-Reply-To: <7veiqhgb4y.fsf@alter.siamese.dyndns.org>

On Tue, Sep 8, 2009 at 09:15, Junio C Hamano<gitster@pobox.com> wrote:

Show 5 quoted lines

> @@ -170,6 +170,18 @@ static int git_merge_trees(int index_only,
>        int rc;
>        struct tree_desc t[3];
>        struct unpack_trees_options opts;
> +       static struct unpack_trees_error_msgs msgs = {

You can make these const, the struct is copied anyway:

> +       opts.msgs = msgs;

Here --^