mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/nor-or-nand-and'

Browse Source 
Eradicate mistaken use of "nor" (that is, essentially "nor" used
not in "neither A nor B" ;-)) from in-code comments, command output
strings, and documentations.

* jl/nor-or-nand-and:
  code and test: fix misuses of "nor"
  comments: fix misuses of "nor"
  contrib: fix misuses of "nor"
  Documentation: fix misuses of "nor"
This commit is contained in:
Junio C Hamano
2014-04-08 12:00:27 -07:00
parent 9b30a0339d 235e8d5914
commit d59c12d7ad
57 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t1001-read-tree-m-2way.sh
View File

@ -18,7 +18,7 @@ In the test, these paths are used:
frotz - not in H added in M
nitfol - in H, stays in M unmodified
rezrov - in H, deleted in M
yomin - not in H nor M
yomin - not in H or M
'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh

2
t/t4005-diff-rename-2.sh
View File

@ -66,7 +66,7 @@ test_expect_success \
# tree has COPYING and rezrov. work tree has the same COPYING and
# copy-edited COPYING.1, and unchanged rezrov. We should not say
# anything about rezrov nor COPYING, since the revised again diff-raw
# anything about rezrov or COPYING, since the revised again diff-raw
# nows how to say Copy.
test_expect_success \

2
t/t4009-diff-rename-4.sh
View File

@ -73,7 +73,7 @@ test_expect_success \
# tree has COPYING and rezrov. work tree has the same COPYING and
# copy-edited COPYING.1, and unchanged rezrov. We should not say
# anything about rezrov nor COPYING, since the revised again diff-raw
# anything about rezrov or COPYING, since the revised again diff-raw
# nows how to say Copy.
test_expect_success \

2
t/t5304-prune.sh
View File

@ -213,7 +213,7 @@ test_expect_success 'garbage report in count-objects -v' '
warning: garbage found: .git/objects/pack/fake.bar
warning: garbage found: .git/objects/pack/foo
warning: garbage found: .git/objects/pack/foo.bar
warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep
warning: no corresponding .idx or .pack: .git/objects/pack/fake2.keep
warning: no corresponding .idx: .git/objects/pack/foo.keep
warning: no corresponding .idx: .git/objects/pack/foo.pack
warning: no corresponding .pack: .git/objects/pack/fake3.idx

2
t/t6036-recursive-corner-cases.sh
View File

@ -388,7 +388,7 @@ test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' '
#
# criss-cross + d/f conflict via add/add:
# Commit A: Neither file 'a' nor directory 'a/' exist.
# Commit A: Neither file 'a' nor directory 'a/' exists.
# Commit B: Introduce 'a'
# Commit C: Introduce 'a/file'
# Commit D: Merge B & C, keeping 'a' and deleting 'a/'

2
t/t7104-reset-hard.sh
View File

@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
'
test_expect_success 'reset --hard did not corrupt index nor cached-tree' '
test_expect_success 'reset --hard did not corrupt index or cached-tree' '
T=$(git write-tree) &&
rm -f .git/index &&

2
t/t9400-git-cvsserver-server.sh
View File

@ -511,7 +511,7 @@ test_expect_success 'cvs co -c (shows module database)' '
# Known issues with git-cvsserver current log output:
# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
# - CVS normally does not internally add a blank first line
# nor a last line with nothing but a space to log messages.
# or a last line with nothing but a space to log messages.
# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
# it converts to local time zone. git-cvsserver doesn't do the +0000