From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nanako Shiraishi <nanako3@lavabit.com>, git@vger.kernel.org
Subject: Re: Improving merge failure message
Date: Tue, 8 Sep 2009 11:11:24 +0200 [thread overview]
Message-ID: <81b0412b0909080211k19470327x97b19eb0bd6ab700@mail.gmail.com> (raw)
In-Reply-To: <7veiqhgb4y.fsf@alter.siamese.dyndns.org>
On Tue, Sep 8, 2009 at 09:15, Junio C Hamano<gitster@pobox.com> wrote:
> @@ -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 --^
next prev parent reply other threads:[~2009-09-08 9:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-08 6:31 Improving merge failure message Nanako Shiraishi
2009-09-08 6:47 ` Junio C Hamano
2009-09-08 7:15 ` Junio C Hamano
2009-09-08 7:20 ` Sverre Rabbelier
2009-09-08 7:48 ` Junio C Hamano
2009-09-08 7:51 ` Jeff King
2009-09-08 7:59 ` Mike Ralphson
2009-09-08 16:34 ` Junio C Hamano
2009-09-08 9:11 ` Alex Riesen [this message]
2009-09-08 10:12 ` Nanako Shiraishi
2009-09-08 8:24 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b0909080211k19470327x97b19eb0bd6ab700@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).