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

4
sha1_file.c
View File

@ -790,7 +790,7 @@ void close_pack_index(struct packed_git *p)
* contain the same set of objects as an existing one. In that case
* the resulting file might be different even if its name would be the
* same. It is best to close any reference to the old pack before it is
* replaced on disk. Of course no index pointers nor windows for given pack
* replaced on disk. Of course no index pointers or windows for given pack
* must subsist at this point. If ever objects from this pack are requested
* again, the new version of the pack will be reinitialized through
* reprepare_packed_git().
@ -1126,7 +1126,7 @@ static void report_helper(const struct string_list *list,
const char *msg;
switch (seen_bits) {
case 0:
msg = "no corresponding .idx nor .pack";
msg = "no corresponding .idx or .pack";
break;
case 1:
msg = "no corresponding .idx";