Skip to content

Commit 0353a0c

Browse files
meyeringgitster
authored andcommitted
remove doubled words, e.g., s/to to/to/, and fix related typos
I found that some doubled words had snuck back into projects from which I'd already removed them, so now there's a "syntax-check" makefile rule in gnulib to help prevent recurrence. Running the command below spotted a few in git, too: git ls-files | xargs perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt])\s+\1\b/gims)' \ -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g;' \ -e 'print "$ARGV:$n:$v\n"}' Signed-off-by: Jim Meyering <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5e31075 commit 0353a0c

File tree

8 files changed

+11
-14
lines changed

8 files changed

+11
-14
lines changed

Documentation/SubmittingPatches

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ don't hide your real name.
276276

277277
If you like, you can put extra tags at the end:
278278

279-
1. "Reported-by:" is used to to credit someone who found the bug that
279+
1. "Reported-by:" is used to credit someone who found the bug that
280280
the patch attempts to fix.
281281
2. "Acked-by:" says that the person who is more familiar with the area
282282
the patch attempts to modify liked the patch.
@@ -608,4 +608,3 @@ following commands:
608608
Just make sure to disable line wrapping in the email client (GMail web
609609
interface will line wrap no matter what, so you need to use a real
610610
IMAP client).
611-

Documentation/git-fetch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pointed by remote tags that it does not yet have, then fetch
3434
those missing tags. If the other end has tags that point at
3535
branches you are not interested in, you will not get them.
3636

37-
'git fetch' can fetch from either a single named repository, or
37+
'git fetch' can fetch from either a single named repository,
3838
or from several repositories at once if <group> is given and
3939
there is a remotes.<group> entry in the configuration file.
4040
(See linkgit:git-config[1]).

Documentation/git-pack-objects.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ base-name::
115115

116116
--honor-pack-keep::
117117
This flag causes an object already in a local pack that
118-
has a .keep file to be ignored, even if it it would have
118+
has a .keep file to be ignored, even if it would have
119119
otherwise been packed.
120120

121121
--incremental::

compat/mingw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ char **make_augmented_environ(const char *const *vars)
11301130

11311131
/*
11321132
* Note, this isn't a complete replacement for getaddrinfo. It assumes
1133-
* that service contains a numerical port, or that it it is null. It
1133+
* that service contains a numerical port, or that it is null. It
11341134
* does a simple search using gethostbyname, and returns one IPv4 host
11351135
* if one was found.
11361136
*/

compat/nedmalloc/malloc.c.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
101101
If you don't like either of these options, you can define
102102
CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything
103-
else. And if if you are sure that your program using malloc has
103+
else. And if you are sure that your program using malloc has
104104
no errors or vulnerabilities, you can define INSECURE to 1,
105105
which might (or might not) provide a small performance improvement.
106106
@@ -2279,12 +2279,12 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
22792279
of the same size are arranged in a circularly-linked list, with only
22802280
the oldest chunk (the next to be used, in our FIFO ordering)
22812281
actually in the tree. (Tree members are distinguished by a non-null
2282-
parent pointer.) If a chunk with the same size an an existing node
2282+
parent pointer.) If a chunk with the same size as an existing node
22832283
is inserted, it is linked off the existing node using pointers that
22842284
work in the same way as fd/bk pointers of small chunks.
22852285
22862286
Each tree contains a power of 2 sized range of chunk sizes (the
2287-
smallest is 0x100 <= x < 0x180), which is is divided in half at each
2287+
smallest is 0x100 <= x < 0x180), which is divided in half at each
22882288
tree level, with the chunks in the smaller half of the range (0x100
22892289
<= x < 0x140 for the top nose) in the left subtree and the larger
22902290
half (0x140 <= x < 0x180) in the right subtree. This is, of course,
@@ -3943,7 +3943,7 @@ static void* sys_alloc(mstate m, size_t nb) {
39433943
least-preferred order):
39443944
1. A call to MORECORE that can normally contiguously extend memory.
39453945
(disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
3946-
or main space is mmapped or a previous contiguous call failed)
3946+
main space is mmapped or a previous contiguous call failed)
39473947
2. A call to MMAP new space (disabled if not HAVE_MMAP).
39483948
Note that under the default settings, if MORECORE is unable to
39493949
fulfill a request, and HAVE_MMAP is true, then mmap is
@@ -5748,5 +5748,3 @@ int mspace_mallopt(int param_number, int value) {
57485748
structure of old version, but most details differ.)
57495749
57505750
*/
5751-
5752-

gitweb/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ You can specify the following configuration variables when building GIT:
2929
The filesystem traversing limit for getting the project list; the number
3030
is taken as depth relative to the projectroot. It is used when
3131
GITWEB_LIST is a directory (or is not set; then project root is used).
32-
Is is meant to speed up project listing on large work trees by limiting
32+
This is meant to speed up project listing on large work trees by limiting
3333
search depth. [Default: 2007]
3434
* GITWEB_LIST
3535
Points to a directory to scan for projects (defaults to project root

sha1_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ static int unpack_object_header(struct packed_git *p,
15341534
enum object_type type;
15351535

15361536
/* use_pack() assures us we have [base, base + 20) available
1537-
* as a range that we can look at at. (Its actually the hash
1537+
* as a range that we can look at. (Its actually the hash
15381538
* size that is assured.) With our object header encoding
15391539
* the maximum deflated object size is 2^137, which is just
15401540
* insane, so we know won't exceed what we have been given.

vcs-svn/trp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ node_type *foo_search(struct trp_root \*treap, node_type \*key)::
9696

9797
node_type *foo_nsearch(struct trp_root \*treap, node_type \*key)::
9898

99-
Like `foo_search`, but if if the key is missing return what
99+
Like `foo_search`, but if the key is missing return what
100100
would be key's successor, were key in treap (NULL if no
101101
successor).
102102

0 commit comments

Comments
 (0)