From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Wincent Colaiuta" <win@wincent.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Date: Wed, 07 Jul 2010 17:26:22 -0700 [thread overview]
Message-ID: <7vd3uystsh.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <9aea70210996b395f5fc04ae48a372f9b51ba182.1278489069.git.nicolas.s.dev@gmx.fr> (Nicolas Sebrecht's message of "Wed\, 7 Jul 2010 09\:54\:08 +0200")
Nicolas Sebrecht <nicolas.s.dev@gmx.fr> writes:
> Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
> ---
>
> The 07/07/10, Junio C Hamano wrote:
>
>> The "struct unpack_trees_error_msgs" mechanism was introduced so that we
>> can change the Porcelain level messages without breaking the plumbing API,
>> which these messages are part of. Please see 8ccba00 (unpack-trees: allow
>> Porcelain to give different error messages, 2008-05-17) and fadd069
>> (merge-recursive: give less scary messages when merge did not start,
>> 2009-09-07) for backstory.
>
> Oh, thanks. I was unaware of this mechanism and didn't care about what I was
> touching.
I suspect that the documentation patch talks about a nonexistent reality.
See 8ccba00 again ;-)
next prev parent reply other threads:[~2010-07-08 0:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-06 5:35 messages confusing Nicolas Sebrecht
2010-07-06 5:53 ` Wincent Colaiuta
2010-07-06 9:13 ` [PATCH] use "up-to-date" in messages instead of "uptodate" for consistency Nicolas Sebrecht
2010-07-06 12:47 ` Ævar Arnfjörð Bjarmason
2010-07-06 15:55 ` [PATCH v2] use "up-to-date" " Nicolas Sebrecht
2010-07-07 5:28 ` Junio C Hamano
2010-07-07 5:46 ` [PATCH v2] " Nicolas Sebrecht
2010-07-07 7:18 ` Junio C Hamano
2010-07-07 7:54 ` [PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message " Nicolas Sebrecht
2010-07-08 0:26 ` Junio C Hamano [this message]
2010-07-09 20:27 ` [PATCH 1/2] checkout: accord documentation to what git does Nicolas Sebrecht
2010-07-09 20:27 ` [PATCH v4 2/2] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency Nicolas Sebrecht
2010-07-10 0:39 ` Junio C Hamano
2010-07-10 0:36 ` [PATCH 1/2] checkout: accord documentation to what git does Junio C Hamano
2010-07-06 6:21 ` messages confusing Junio C Hamano
2010-07-06 8:58 ` Nicolas Sebrecht
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vd3uystsh.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=nicolas.s.dev@gmx.fr \
--cc=win@wincent.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).