Re: [PATCH] Fix spelling mistakes

[Junio C Hamano]

Eric Engestrom  writes:

> I went by word-count: "through" was way more common than "thru", so
> I kept the fix.

That is not a "fix" (as it is not touching "mistakes") but "making
them consistent".  I do not personally feel strongly against such a
change, but please leave them out of "Subject: [PATCH] typofix".

> BTW, I used codespell to fix those, I didn't do it by hand :]
> https://github.com/lucasdemarchi/codespell

Heh, cute ;-)

> I can remove the "thru" fixes if you'd prefer, and resend with only the
> other fixes.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Fix spelling mistakes

[Eric Engestrom]

I went by word-count: "through" was way more common than "thru", so
I kept the fix.
BTW, I used codespell to fix those, I didn't do it by hand :]
https://github.com/lucasdemarchi/codespell

I can remove the "thru" fixes if you'd prefer, and resend with only the
other fixes.

Cheers,
Eric


On Sun, Apr 03, 2016 at 11:16:35AM -0700, Junio C Hamano wrote:
> Eric Engestrom  writes:
> 
> > Signed-off-by: Eric Engestrom 
> > ---
> 
> While I think "through" is not wrong, I do not think it is worth the
> patch churn to do s/thru/through/;
> 
> If the original author wants to spell the word "thru", we are in no
> position to say it must be spelled "through" [*1*].  It's a bit
> different from correcting a non-word "usefull" to "useful".  The
> only "Huh?"  I saw around "thru" in this patch was that these said
> "fall thru" while I am fairly sure there are many places that say
> "fallthru", which is fairly common way to say that word in comments.
> 
> Other changes looked all sensible.
> 
> Thanks for going through the codebase with a fine-toothed comb.
> 
> [Footnote]
> 
> *1* http://www.merriam-webster.com/words-at-play/how-thru-turned-into-through
> and http://grammarist.com/spelling/through-thru/ were amusing reads.
> 
> >  builtin/apply.c| 2 +-
> >  builtin/clean.c| 2 +-
> >  config.c   | 2 +-
> >  contrib/examples/git-am.sh | 2 +-
> >  contrib/hooks/multimail/README | 2 +-
> >  contrib/subtree/t/t7900-subtree.sh | 2 +-
> >  diff.c | 2 +-
> >  dir.c  | 2 +-
> >  git-p4.py  | 2 +-
> >  refs.h | 2 +-
> >  sha1-lookup.c  | 2 +-
> >  t/t5535-fetch-push-symref.sh   | 2 +-
> >  t/t6030-bisect-porcelain.sh| 2 +-
> >  worktree.c | 2 +-
> >  14 files changed, 14 insertions(+), 14 deletions(-)
> >
> > diff --git a/builtin/apply.c b/builtin/apply.c
> > index deb05d0..02a0259 100644
> > --- a/builtin/apply.c
> > +++ b/builtin/apply.c
> > @@ -3980,7 +3980,7 @@ static void show_rename_copy(struct patch *p)
> > old = slash_old + 1;
> > new = slash_new + 1;
> > }
> > -   /* p->old_name thru old is the common prefix, and old and new
> > +   /* p->old_name through old is the common prefix, and old and new
> >  * through the end of names are renames
> >  */
> > if (old != p->old_name)
> > diff --git a/builtin/clean.c b/builtin/clean.c
> > index 0371010..5426f9f 100644
> > --- a/builtin/clean.c
> > +++ b/builtin/clean.c
> > @@ -192,7 +192,7 @@ static int remove_dirs(struct strbuf *path, const char 
> > *prefix, int force_flag,
> > strbuf_setlen(path, len);
> > strbuf_addstr(path, e->d_name);
> > if (lstat(path->buf, ))
> > -   ; /* fall thru */
> > +   ; /* fall through */
> > else if (S_ISDIR(st.st_mode)) {
> > if (remove_dirs(path, prefix, force_flag, dry_run, 
> > quiet, ))
> > ret = 1;
> > diff --git a/config.c b/config.c
> > index 9ba40bc..482ef2e 100644
> > --- a/config.c
> > +++ b/config.c
> > @@ -1278,7 +1278,7 @@ static void git_config_raw(config_fn_t fn, void *data)
> >  * something went really wrong and we should stop
> >  * immediately.
> >  */
> > -   die(_("unknown error occured while reading the configuration 
> > files"));
> > +   die(_("unknown error occurred while reading the configuration 
> > files"));
> >  }
> >  
> >  static void configset_iter(struct config_set *cs, config_fn_t fn, void 
> > *data)
> > diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh
> > index dd539f1..b3d30b7 100755
> > --- a/contrib/examples/git-am.sh
> > +++ b/contrib/examples/git-am.sh
> > @@ -542,7 +542,7 @@ then
> > rm -f "$dotest/dirtyindex"
> >  else
> > # Possible stray $dotest directory in the independent-run
> > -   # case; in the --rebasing case, it is upto the caller
> > +   # case; in the --rebasing case, it is up to the caller
> > # (git-rebase--am) to take care of stray directories.
> > if test -d "$dotest" && test -z "$rebasing"
> > then
> > diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
> > index 5512068..80df811 100644
> > --- a/contrib/hooks/multimail/README
> > +++ b/contrib/hooks/multimail/README
> > @@ -489,7 +489,7 @@ multimailhook.commitLogOpts
> >  multimailhook.dateSubstitute
> >  
> >  String to use as a substitute for ``Date:`` in the output of ``git
> > -log`` while formatting commit messages. This is usefull to avoid
> > +log`` while formatting commit messages. This is useful to avoid
> >  emitting a line that can be interpreted by mailers as the start of
> >  a cited message (Zimbra webmail in particular). Defaults to
> >  

Re: [PATCH] Fix spelling mistakes

[Junio C Hamano]

Eric Engestrom  writes:

> Signed-off-by: Eric Engestrom 
> ---

While I think "through" is not wrong, I do not think it is worth the
patch churn to do s/thru/through/;

If the original author wants to spell the word "thru", we are in no
position to say it must be spelled "through" [*1*].  It's a bit
different from correcting a non-word "usefull" to "useful".  The
only "Huh?"  I saw around "thru" in this patch was that these said
"fall thru" while I am fairly sure there are many places that say
"fallthru", which is fairly common way to say that word in comments.

Other changes looked all sensible.

Thanks for going through the codebase with a fine-toothed comb.

[Footnote]

*1* http://www.merriam-webster.com/words-at-play/how-thru-turned-into-through
and http://grammarist.com/spelling/through-thru/ were amusing reads.

>  builtin/apply.c| 2 +-
>  builtin/clean.c| 2 +-
>  config.c   | 2 +-
>  contrib/examples/git-am.sh | 2 +-
>  contrib/hooks/multimail/README | 2 +-
>  contrib/subtree/t/t7900-subtree.sh | 2 +-
>  diff.c | 2 +-
>  dir.c  | 2 +-
>  git-p4.py  | 2 +-
>  refs.h | 2 +-
>  sha1-lookup.c  | 2 +-
>  t/t5535-fetch-push-symref.sh   | 2 +-
>  t/t6030-bisect-porcelain.sh| 2 +-
>  worktree.c | 2 +-
>  14 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index deb05d0..02a0259 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -3980,7 +3980,7 @@ static void show_rename_copy(struct patch *p)
>   old = slash_old + 1;
>   new = slash_new + 1;
>   }
> - /* p->old_name thru old is the common prefix, and old and new
> + /* p->old_name through old is the common prefix, and old and new
>* through the end of names are renames
>*/
>   if (old != p->old_name)
> diff --git a/builtin/clean.c b/builtin/clean.c
> index 0371010..5426f9f 100644
> --- a/builtin/clean.c
> +++ b/builtin/clean.c
> @@ -192,7 +192,7 @@ static int remove_dirs(struct strbuf *path, const char 
> *prefix, int force_flag,
>   strbuf_setlen(path, len);
>   strbuf_addstr(path, e->d_name);
>   if (lstat(path->buf, ))
> - ; /* fall thru */
> + ; /* fall through */
>   else if (S_ISDIR(st.st_mode)) {
>   if (remove_dirs(path, prefix, force_flag, dry_run, 
> quiet, ))
>   ret = 1;
> diff --git a/config.c b/config.c
> index 9ba40bc..482ef2e 100644
> --- a/config.c
> +++ b/config.c
> @@ -1278,7 +1278,7 @@ static void git_config_raw(config_fn_t fn, void *data)
>* something went really wrong and we should stop
>* immediately.
>*/
> - die(_("unknown error occured while reading the configuration 
> files"));
> + die(_("unknown error occurred while reading the configuration 
> files"));
>  }
>  
>  static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
> diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh
> index dd539f1..b3d30b7 100755
> --- a/contrib/examples/git-am.sh
> +++ b/contrib/examples/git-am.sh
> @@ -542,7 +542,7 @@ then
>   rm -f "$dotest/dirtyindex"
>  else
>   # Possible stray $dotest directory in the independent-run
> - # case; in the --rebasing case, it is upto the caller
> + # case; in the --rebasing case, it is up to the caller
>   # (git-rebase--am) to take care of stray directories.
>   if test -d "$dotest" && test -z "$rebasing"
>   then
> diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
> index 5512068..80df811 100644
> --- a/contrib/hooks/multimail/README
> +++ b/contrib/hooks/multimail/README
> @@ -489,7 +489,7 @@ multimailhook.commitLogOpts
>  multimailhook.dateSubstitute
>  
>  String to use as a substitute for ``Date:`` in the output of ``git
> -log`` while formatting commit messages. This is usefull to avoid
> +log`` while formatting commit messages. This is useful to avoid
>  emitting a line that can be interpreted by mailers as the start of
>  a cited message (Zimbra webmail in particular). Defaults to
>  ``CommitDate: ``. Set to an empty string or ``none`` to deactivate
> diff --git a/contrib/subtree/t/t7900-subtree.sh 
> b/contrib/subtree/t/t7900-subtree.sh
> index 3bf96a9..0cf044c 100755
> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -932,7 +932,7 @@ test_expect_success 'split a new subtree without --onto 
> option' '
>  
>   # also test that we still can split out an entirely new subtree
>   # if the parent of the first commit in the tree is not