From: Phil Hord <hordp@cisco.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 01/18] advice: Introduce error_resolve_conflict
Date: Thu, 21 Jul 2011 11:35:44 -0400 [thread overview]
Message-ID: <4E284750.4040104@cisco.com> (raw)
In-Reply-To: <1311095876-3098-2-git-send-email-artagnon@gmail.com>
On 07/19/2011 01:17 PM, Ramkumar Ramachandra wrote:
> Enable future callers to report a conflict and not die immediately by
> introducing a new function called error_resolve_conflict.
> Re-implement die_resolve_conflict as a call to error_resolve_conflict
> followed by a call to die. Consequently, the message printed by
> die_resolve_conflict changes from
>
> fatal: 'commit' is not possible because you have unmerged files.
> Please, fix them up in the work tree ...
> ...
>
> to
>
> error: 'commit' is not possible because you have unmerged files.
> hint: Please, fix them up in the work tree ...
> hint: ...
> fatal: Exiting because of an unresolved conflict.
This is a tiny grammar nit, but "Please," sounds superfluous now that
it's preceded by "hint:". "Hint" sounds like I'm doing you a favor by
telling you something to do. "Please" sounds like you're doing me a
favor by doing something. Together they just sound like a typo.
In either case, the comma after "Please" is wrong. (There are other
messages in the git code which make this same mistake, but there are
more which use "Please <imperative-verb>..." correctly.)
Note: I see this repeated in patch 06/18 in this series, and there are
probably others.
Phil
next prev parent reply other threads:[~2011-07-21 15:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-19 17:17 [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-21 15:35 ` Phil Hord [this message]
2011-07-22 22:35 ` Jeff King
2011-07-24 10:23 ` Ramkumar Ramachandra
2011-07-24 18:15 ` Junio C Hamano
2011-07-25 21:17 ` Phil Hord
2011-07-19 17:17 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-19 19:55 ` Jeff King
2011-07-19 20:35 ` Jonathan Nieder
2011-07-19 21:26 ` Junio C Hamano
2011-07-19 21:57 ` Jeff King
2011-07-24 10:17 ` Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 06/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 07/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 08/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 09/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 10/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 11/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 13/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 14/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 15/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 18/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-19 18:47 ` [GSoC update] Sequencer for inclusion v2 Junio C Hamano
2011-07-20 9:02 ` Ramkumar Ramachandra
2011-07-19 23:54 ` Junio C Hamano
2011-07-24 10:11 ` Ramkumar Ramachandra
2011-07-24 18:17 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-07-27 3:18 [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Ramkumar Ramachandra
2011-07-27 3:18 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-28 16:52 [PATCH 00/18] Sequencer for inclusion v4 Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-08-01 18:06 [PATCH v5 00/18] Sequencer for inclusion Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-08-04 10:38 [PATCH 00/18] Sequencer for inclusion v6 Ramkumar Ramachandra
2011-08-04 10:38 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
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=4E284750.4040104@cisco.com \
--to=hordp@cisco.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.