Subject: Re: [PATCH v5 4/4] Fix misuses of "nor" outside comments and in tests

From: Junio C Hamano <[email-masked]>
Date: Mon, 31 Mar 2014 15:27:54 -0700

Justin Lebar <[email-masked]> 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.