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 <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering committed
Apr 13, 2011 at 17:39 UTC
0353a0c4ec91cf2d0a8e209025aa2e1909d05f19
8 files changed
+11
-14
Documentation/SubmittingPatches
+1
-2
@@ -276,7 +276,7 @@ don't hide your real name.
276
277
If you like, you can put extra tags at the end:
278
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
280
the patch attempts to fix.
281
2. "Acked-by:" says that the person who is more familiar with the area
282
the patch attempts to modify liked the patch.
@@ -608,4 +608,3 @@ following commands:
608
Just make sure to disable line wrapping in the email client (GMail web
609
interface will line wrap no matter what, so you need to use a real
610
IMAP client).
611
-
Documentation/git-fetch.txt
+1
-1
@@ -34,7 +34,7 @@ pointed by remote tags that it does not yet have, then fetch
34
those missing tags. If the other end has tags that point at
35
branches you are not interested in, you will not get them.
36
37
-'git fetch' can fetch from either a single named repository, or
37
+'git fetch' can fetch from either a single named repository,
38
or from several repositories at once if <group> is given and
39
there is a remotes.<group> entry in the configuration file.
40
(See linkgit:git-config[1]).
Documentation/git-pack-objects.txt
+1
-1
@@ -115,7 +115,7 @@ base-name::
115
116
--honor-pack-keep::
117
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
119
otherwise been packed.
120
121
--incremental::
compat/mingw.c
+1
-1
@@ -1130,7 +1130,7 @@ char **make_augmented_environ(const char *const *vars)
1130
1131
/*
1132
* 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
1134
* does a simple search using gethostbyname, and returns one IPv4 host
1135
* if one was found.
1136
*/
compat/nedmalloc/malloc.c.h
+4
-6
@@ -100,7 +100,7 @@
100
101
If you don't like either of these options, you can define
102
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
104
no errors or vulnerabilities, you can define INSECURE to 1,
105
which might (or might not) provide a small performance improvement.
106
@@ -2279,12 +2279,12 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
2279
of the same size are arranged in a circularly-linked list, with only
2280
the oldest chunk (the next to be used, in our FIFO ordering)
2281
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
2283
is inserted, it is linked off the existing node using pointers that
2284
work in the same way as fd/bk pointers of small chunks.
2285
2286
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
2288
tree level, with the chunks in the smaller half of the range (0x100
2289
<= x < 0x140 for the top nose) in the left subtree and the larger
2290
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) {
3943
least-preferred order):
3944
1. A call to MORECORE that can normally contiguously extend memory.
3945
(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)
3947
2. A call to MMAP new space (disabled if not HAVE_MMAP).
3948
Note that under the default settings, if MORECORE is unable to
3949
fulfill a request, and HAVE_MMAP is true, then mmap is
@@ -5748,5 +5748,3 @@ History:
5748
structure of old version, but most details differ.)
5749
5750
*/
5751
-
5752
-
gitweb/README
+1
-1
@@ -29,7 +29,7 @@ You can specify the following configuration variables when building GIT:
29
The filesystem traversing limit for getting the project list; the number
30
is taken as depth relative to the projectroot. It is used when
31
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
33
search depth. [Default: 2007]
34
* GITWEB_LIST
35
Points to a directory to scan for projects (defaults to project root
sha1_file.c
+1
-1
@@ -1534,7 +1534,7 @@ static int unpack_object_header(struct packed_git *p,
1534
enum object_type type;
1535
1536
/* 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
1538
* size that is assured.) With our object header encoding
1539
* the maximum deflated object size is 2^137, which is just
1540
* insane, so we know won't exceed what we have been given.
vcs-svn/trp.txt
+1
-1
@@ -96,7 +96,7 @@ node_type *foo_search(struct trp_root \*treap, node_type \*key)::
96
97
node_type *foo_nsearch(struct trp_root \*treap, node_type \*key)::
98
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
100
would be key's successor, were key in treap (NULL if no
101
successor).
102