code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Justin Lebar committed
Mar 31, 2014 at 15:11 UTC
235e8d591480d7e1378c27fe65c5529625d4b5be
12 files changed
+16
-16
builtin/clean.c
+3
-3
@@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
903
904
if (!interactive && !dry_run && !force) {
905
if (config_set)
906
- die(_("clean.requireForce set to true and neither -i, -n nor -f given; "
906
+ die(_("clean.requireForce set to true and neither -i, -n, nor -f given; "
907
"refusing to clean"));
908
else
909
- die(_("clean.requireForce defaults to true and neither -i, -n nor -f given; "
910
- "refusing to clean"));
909
+ die(_("clean.requireForce defaults to true and neither -i, -n, nor -f given;"
910
+ " refusing to clean"));
911
}
912
913
if (force > 1)
builtin/commit.c
+1
-1
@@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
1123
if (argc == 0 && only && amend)
1124
only_include_assumed = _("Clever... amending the last one with dirty index.");
1125
if (argc > 0 && !also && !only)
1126
- only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths...");
1126
+ only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths...");
1127
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
1128
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
1129
else if (!strcmp(cleanup_arg, "verbatim"))
git-add--interactive.perl
+2
-2
@@ -1156,9 +1156,9 @@ sub help_patch_cmd {
1156
print colored $help_color, <<EOF ;
1157
y - $verb this hunk$target
1158
n - do not $verb this hunk$target
1159
-q - quit; do not $verb this hunk nor any of the remaining ones
1159
+q - quit; do not $verb this hunk or any of the remaining ones
1160
a - $verb this hunk and all later hunks in the file
1161
-d - do not $verb this hunk nor any of the later hunks in the file
1161
+d - do not $verb this hunk or any of the later hunks in the file
1162
g - select a hunk to go to
1163
/ - search for a hunk matching the given regex
1164
j - leave this hunk undecided, see next undecided hunk
perl/Git/SVN.pm
+2
-2
@@ -480,8 +480,8 @@ sub refname {
480
# It cannot end with a slash /, we'll throw up on this because
481
# SVN can't have directories with a slash in their name, either:
482
if ($refname =~ m{/$}) {
483
- die "ref: '$refname' ends with a trailing slash, this is ",
484
- "not permitted by git nor Subversion\n";
483
+ die "ref: '$refname' ends with a trailing slash; this is ",
484
+ "not permitted by git or Subversion\n";
485
}
486
487
# It cannot have ASCII control character space, tilde ~, caret ^,
sha1_file.c
+1
-1
@@ -1123,7 +1123,7 @@ static void report_helper(const struct string_list *list,
1123
const char *msg;
1124
switch (seen_bits) {
1125
case 0:
1126
- msg = "no corresponding .idx nor .pack";
1126
+ msg = "no corresponding .idx or .pack";
1127
break;
1128
case 1:
1129
msg = "no corresponding .idx";
t/t1001-read-tree-m-2way.sh
+1
-1
@@ -18,7 +18,7 @@ In the test, these paths are used:
18
frotz - not in H added in M
19
nitfol - in H, stays in M unmodified
20
rezrov - in H, deleted in M
21
- yomin - not in H nor M
21
+ yomin - not in H or M
22
'
23
. ./test-lib.sh
24
. "$TEST_DIRECTORY"/lib-read-tree.sh
t/t4005-diff-rename-2.sh
+1
-1
@@ -66,7 +66,7 @@ test_expect_success \
66
67
# tree has COPYING and rezrov. work tree has the same COPYING and
68
# copy-edited COPYING.1, and unchanged rezrov. We should not say
69
-# anything about rezrov nor COPYING, since the revised again diff-raw
69
+# anything about rezrov or COPYING, since the revised again diff-raw
70
# nows how to say Copy.
71
72
test_expect_success \
t/t4009-diff-rename-4.sh
+1
-1
@@ -73,7 +73,7 @@ test_expect_success \
73
74
# tree has COPYING and rezrov. work tree has the same COPYING and
75
# copy-edited COPYING.1, and unchanged rezrov. We should not say
76
-# anything about rezrov nor COPYING, since the revised again diff-raw
76
+# anything about rezrov or COPYING, since the revised again diff-raw
77
# nows how to say Copy.
78
79
test_expect_success \
t/t5304-prune.sh
+1
-1
@@ -213,7 +213,7 @@ test_expect_success 'garbage report in count-objects -v' '
213
warning: garbage found: .git/objects/pack/fake.bar
214
warning: garbage found: .git/objects/pack/foo
215
warning: garbage found: .git/objects/pack/foo.bar
216
-warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep
216
+warning: no corresponding .idx or .pack: .git/objects/pack/fake2.keep
217
warning: no corresponding .idx: .git/objects/pack/foo.keep
218
warning: no corresponding .idx: .git/objects/pack/foo.pack
219
warning: no corresponding .pack: .git/objects/pack/fake3.idx
t/t6036-recursive-corner-cases.sh
+1
-1
@@ -388,7 +388,7 @@ test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' '
388
389
#
390
# criss-cross + d/f conflict via add/add:
391
-# Commit A: Neither file 'a' nor directory 'a/' exist.
391
+# Commit A: Neither file 'a' nor directory 'a/' exists.
392
# Commit B: Introduce 'a'
393
# Commit C: Introduce 'a/file'
394
# Commit D: Merge B & C, keeping 'a' and deleting 'a/'
t/t7104-reset.sh
+1
-1
@@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
33
34
'
35
36
-test_expect_success 'reset --hard did not corrupt index nor cached-tree' '
36
+test_expect_success 'reset --hard did not corrupt index or cached-tree' '
37
38
T=$(git write-tree) &&
39
rm -f .git/index &&
t/t9400-git-cvsserver-server.sh
+1
-1
@@ -512,7 +512,7 @@ test_expect_success 'cvs co -c (shows module database)' '
512
# Known issues with git-cvsserver current log output:
513
# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
514
# - CVS normally does not internally add a blank first line
515
-# nor a last line with nothing but a space to log messages.
515
+# or a last line with nothing but a space to log messages.
516
# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
517
# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
518
# it converts to local time zone. git-cvsserver doesn't do the +0000