Re: [PATCH] correct a few doubled-word nits in comments and documentation

[Jonathan Nieder <jrnieder@gmail.com>]

(+cc: Ævar for a side note marked with (*) below)
Hi,

Jim Meyering wrote:

> Found by running this command:
> $ git ls-files -z|xargs -0 perl -0777 -n \
>  -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \
>  -e '  {' \
>  -e '    $n = ($` =~ tr/\n/\n/ + 1);' \
>  -e '    ($v = $&) =~ s/\n/\\n/g;' \
>  -e '    print "$ARGV:$n:$v\n";' \
>  -e '  }'

Yeah, this often happens when a person returns to writing after being
interrupted in the middle of a train of thought.

[...]
> +++ b/Documentation/git-sh-i18n--envsubst.txt
> @@ -25,7 +25,7 @@ plumbing scripts and/or are writing new ones.
[...]
>  used internally by linkgit:git-sh-i18n[1] to interpolate the variables
> -passed to the the `eval_gettext` function.
> +passed to the `eval_gettext` function.

Good catch.

[...]
> +++ b/attr.h
> @@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);
> 
>  /*
>   * Retrieve all attributes that apply to the specified path.  *num
> - * will be set the the number of attributes on the path; **check will
> + * will be set the number of attributes on the path; **check will

Shouldn't this say "to the"?

[...]
> +++ b/gitweb/static/js/lib/cookies.js
> @@ -30,7 +30,7 @@
>   *                            If set to null or omitted, the cookie will be a session cookie
> - *                            and will not be retained when the the browser exits.
> + *                            and will not be retained when the browser exits.

Looks good.

[...]
> +++ b/po/README
> @@ -178,7 +178,7 @@ used:
> 
>  C:
> 
> - - Include builtin.h at the top, it'll pull in in gettext.h, which
> + - Include builtin.h at the top, it'll pull in gettext.h, which
>     defines the gettext interface. Consult with the list if you need to
>     use gettext.h directly.

Not related to this patch, but the sentence is a comma splice.  I'm
also not convinced that #include-ing builtin.h is actually a good idea
when you are not defining or using functions declared in that header. (*)

But that's all orthogonal to your patch, so looks good.

Patch for squashing in follows.

Thanks,
Jonathan

diff --git i/attr.h w/attr.h
index dea590a7..8b08d33a 100644
--- i/attr.h
+++ w/attr.h
@@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);
 
 /*
  * Retrieve all attributes that apply to the specified path.  *num
- * will be set the number of attributes on the path; **check will
+ * will be set to the number of attributes on the path; **check will
  * be set to point at a newly-allocated array of git_attr_check
  * objects describing the attributes and their values.  *check must be
  * free()ed by the caller.