Re: [PATCH v5 4/4] Fix misuses of "nor" outside comments and in tests
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 31, 2014, 22:27 UTC
- Message-ID
- <xmqq7g7a2ec5.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1396303907-23291-4-git-send-email-jlebar@google.com>
Justin Lebar <jlebar@google.com> writes:
Show 10 quoted lines
> 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.
Show 12 quoted lines
> 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.