From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Shawn Ligocki <sligocki@gmail.com>, git@vger.kernel.org
Subject: Re: Merge made by recursive?
Date: Wed, 25 May 2011 15:50:32 -0400 [thread overview]
Message-ID: <20110525195032.GC27260@sigill.intra.peff.net> (raw)
In-Reply-To: <7vvcwy37de.fsf@alter.siamese.dyndns.org>
On Wed, May 25, 2011 at 12:30:53PM -0700, Junio C Hamano wrote:
> I think so. An earlier version of "git merge" used to say something like:
>
> Committed merge ..., made by resolve.
>
> back in Sept 2005, so it is not so recent development. If we change it
> now, scripts in thousands of existing users hands might cringe instead,
> though.
I was going to say "those scripts are stupid and broken for parsing
stderr", but:
1. We actually write this (and many other diagnostic messages) to
stdout, not stderr. That seems weird and unusual.
2. The message ends up in the reflog.
Also, most of the rest of the merge output has been gettext-ized, but
not this message. If we are going to declare it not parseable, should we
also be internationalizing it?
-Peff
next prev parent reply other threads:[~2011-05-25 19:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 17:28 Merge made by recursive? Shawn Ligocki
2011-05-25 17:42 ` Ramkumar Ramachandra
2011-05-25 18:04 ` Jakub Narebski
2011-05-25 19:30 ` Junio C Hamano
2011-05-25 19:50 ` Jeff King [this message]
2011-05-25 20:17 ` Junio C Hamano
2011-05-25 20:47 ` Junio C Hamano
2011-05-25 21:02 ` Jeff King
2011-05-25 21:25 ` Jeff King
2011-05-25 22:46 ` Jeff King
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=20110525195032.GC27260@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sligocki@gmail.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).