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

[Junio C Hamano]

Justin Lebar  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.

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Justin Lebar]

Signed-off-by: Justin Lebar 
---
 builtin/clean.c   | 6 +++---
 builtin/commit.c  | 2 +-
 git-add--interactive.perl | 4 ++--
 perl/Git/SVN.pm   | 4 ++--
 sha1_file.c   | 2 +-
 t/t1001-read-tree-m-2way.sh   | 2 +-
 t/t4005-diff-rename-2.sh  | 2 +-
 t/t4009-diff-rename-4.sh  | 2 +-
 t/t5304-prune.sh  | 2 +-
 t/t6036-recursive-corner-cases.sh | 2 +-
 t/t7104-reset.sh  | 2 +-
 t/t9400-git-cvsserver-server.sh   | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

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; "
  "refusing to clean"));
else
-   die(_("clean.requireForce defaults to true and neither 
-i, -n nor -f given; "
- "refusing to clean"));
+   die(_("clean.requireForce defaults to true and neither 
-i, -n, nor -f given;"
+ " refusing to clean"));
}
 
if (force > 1)
diff --git a/builtin/commit.c b/builtin/commit.c
index 26b2986..5d594a4 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const 
char *argv[],
if (argc == 0 && only && amend)
only_include_assumed = _("Clever... amending the last one with 
dirty index.");
if (argc > 0 && !also && !only)
-   only_include_assumed = _("Explicit paths specified without -i 
nor -o; assuming --only paths...");
+   only_include_assumed = _("Explicit paths specified without -i 
or -o; assuming --only paths...");
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
else if (!strcmp(cleanup_arg, "verbatim"))
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 24bb1ab..32c2f9c 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1156,9 +1156,9 @@ sub help_patch_cmd {
print colored $help_color,