From: Junio C Hamano <gitster@pobox•com>
To: Justin Lebar <jlebar@google•com>
Cc: git@vger•kernel.org, Richard Hansen <rhansen@bbn•com>,
"Shawn O. Pearce" <spearce@spearce•org>,
Jeff King <peff@peff•net>, Jonathan Nieder <jrnieder@gmail•com>
Subject: Re: [PATCH v5 4/4] Fix misuses of "nor" outside comments and in tests
Date: Mon, 31 Mar 2014 15:27:54 -0700 [thread overview]
Message-ID: <xmqq7g7a2ec5.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1396303907-23291-4-git-send-email-jlebar@google.com> (Justin Lebar's message of "Mon, 31 Mar 2014 15:11:47 -0700")
Justin Lebar <jlebar@google•com> writes:
> diff --git a/builtin/clean.c b/builtin/clean.c
> index 5502957..977a068 100644
> --- a/builtin/clean.c
> +++ b/builtin/clean.c
> @@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
>
> if (!interactive && !dry_run && !force) {
> if (config_set)
> - die(_("clean.requireForce set to true and neither -i, -n nor -f given; "
> + die(_("clean.requireForce set to true and neither -i, -n, nor -f given; "
Encouraging Oxford/Harvard comma may or may not be desirable; it
does not seem to be a good idea to mix it in a patch to fix the
misuse of "nor", I would think.
> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
> index 62f3293..a59564f 100644
> --- a/perl/Git/SVN.pm
> +++ b/perl/Git/SVN.pm
> @@ -480,8 +480,8 @@ sub refname {
> # It cannot end with a slash /, we'll throw up on this because
> # SVN can't have directories with a slash in their name, either:
> if ($refname =~ m{/$}) {
> - die "ref: '$refname' ends with a trailing slash, this is ",
> - "not permitted by git nor Subversion\n";
> + die "ref: '$refname' ends with a trailing slash; this is ",
> + "not permitted by git or Subversion\n";
This s/,/;/ is a good change that would not be controversial.
next prev parent reply other threads:[~2014-03-31 22:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-31 22:11 [PATCH v5 1/4] Documentation: Fix misuses of "nor" Justin Lebar
2014-03-31 22:11 ` [PATCH v5 2/4] contrib: " Justin Lebar
2014-03-31 22:11 ` [PATCH v5 3/4] Fix misuses of "nor" in comments Justin Lebar
2014-03-31 22:11 ` [PATCH v5 4/4] Fix misuses of "nor" outside comments and in tests Justin Lebar
2014-03-31 22:27 ` Junio C Hamano [this message]
2014-03-31 23:19 ` [PATCH v5 1/4] Documentation: Fix misuses of "nor" Junio C Hamano
2014-04-01 16:48 ` Justin Lebar
2014-04-01 19:04 ` Junio C Hamano
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=xmqq7g7a2ec5.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jlebar@google$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=rhansen@bbn$(echo .)com \
--cc=spearce@spearce$(echo .)org \
/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