From: Nanako Shiraishi <nanako3@lavabit•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: Improving merge failure message
Date: Tue, 08 Sep 2009 19:12:37 +0900 [thread overview]
Message-ID: <20090908191237.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <7veiqhgb4y.fsf@alter.siamese.dyndns.org>
Quoting Junio C Hamano <gitster@pobox•com>
> Notable points are:
>
> - End the messages with "Aborting."; they are given when the three-way
> merge stops without harming the work tree;
>
> - Do not give the extra message after unpack_trees() already errored out.
> This "merging of trees failed" message was primarily for debugging
> merge-recursive itself, and the end user cannot do much with the object
> names given in the message anyway.
>
> But do give it under higher verbosity level, or when it happens during
> the inner merge (the "recursive" one), as unpack_trees() should not
> fail for the inner merge under normal conditions.
>
> We could later add instructions on how to recover (i.e. "stash changes
> away or commit on a side branch and retry") instead of the silent
> exit(128) I have down there, and then use Peff's advice.* mechanism to
> squelch it (e.g. "advice.mergeindirtytree"), but they are separate topics.
Thank you for a quick response. The patch works fine here, so if you want
please add:
Tested-by: Nanako Shiraishi <nanako3@lavabit•com>
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
next prev parent reply other threads:[~2009-09-08 10: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
2009-09-08 10:12 ` Nanako Shiraishi [this message]
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=20090908191237.6117@nanako3.lavabit.com \
--to=nanako3@lavabit$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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