git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Various typofixes

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Apr 11, 2013, 21:43 UTC
Message-ID
<CAPig+cSXC6cA8gc1T=byqeQF_gUYKpHTjpTt54Xog=jtfdgMwA@mail.gmail.com>
In-Reply-To
<4cb23e38819d620f53be032d0765fbe374ddb717.1365712583.git.stefano.lattarini@gmail.com>

On Thu, Apr 11, 2013 at 4:55 PM, Stefano Lattarini <stefano.lattarini@gmail.com> wrote:

Show 14 quoted lines
> Mostly suggested by codespell <https://github.com/lucasdemarchi/codespell>
>
> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
> ---
> diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
> index 8c96ed9..aab8153 100644
> --- a/compat/regex/regcomp.c
> +++ b/compat/regex/regcomp.c
> @@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
>
>  /* Entry point of the parser.
>     Parse the regular expression REGEXP and return the structure tree.
> -   If an error is occured, ERR is set by error code, and return NULL.
> +   If an error is occurred, ERR is set by error code, and return NULL.

Not new in this patch, but the grammar "error is occurred" is rather poor. Since this is a cleanup patch, perhaps it makes sense to adjust the grammar as well.

Show 9 quoted lines
>     This function build the following tree, from regular expression <reg_exp>:
>            CAT
>            / \
> @@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
>  /* This is intended for the expressions like "a{1,3}".
>     Fetch a number from `input', and return the number.
>     Return -1, if the number field is empty like "{,1}".
> -   Return -2, If an error is occured.  */
> +   Return -2, If an error is occurred.  */
Also not new with the patch: s/If/if/
Ditto regarding grammar.
Show 10 quoted lines
> diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
> index 193854c..237642c 100644
> --- a/compat/regex/regex_internal.c
> +++ b/compat/regex/regex_internal.c
> @@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
>
>  /* Insert the new element ELEM to the re_node_set* SET.
>     SET should not already have ELEM.
> -   return -1 if an error is occured, return 1 otherwise.  */
> +   return -1 if an error is occurred, return 1 otherwise.  */
Ditto: grammar
Show 9 quoted lines
>
>  static int
>  internal_function
> @@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)
>
>  /* Insert the new element ELEM to the re_node_set* SET.
>     SET should not already have any element greater than or equal to ELEM.
> -   Return -1 if an error is occured, return 1 otherwise.  */
> +   Return -1 if an error is occurred, return 1 otherwise.  */
Grammar.
Show 8 quoted lines
>  static int
>  internal_function
> @@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)
>
>
>  /* Add the token TOKEN to dfa->nodes, and return the index of the token.
> -   Or return -1, if an error will be occured.  */
> +   Or return -1, if an error will be occurred.  */
Grammar.
Show 6 quoted lines
> diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
> index b6405ce..e764ddc 100755
> --- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
> +++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
> -test_expect_failure 'test of correct formating for file name begining with special character' '
> +test_expect_failure 'test of correct formating for file name beginning with special character' '
Missed by codespell: s/formating/formatting/
>         wiki_reset &&
>         git clone mediawiki::'"$WIKI_URL"' mw_dir_13 &&
>         (
> @@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci
Ditto: s/formating/formatting/
Show 9 quoted lines
>                 echo "my new file {char_1" >\{char_1.mw &&
>                 echo "my new file [char_2" >\[char_2.mw &&
>                 git add . &&
> -               git commit -am "commiting some exotic file name..." &&
> +               git commit -am "committing some exotic file name..." &&
>                 git push &&
>                 git pull
>         ) &&
> @@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' '
s/formating/formatting/
Show 8 quoted lines
>                 echo "my new file char{_1" >Char\{_1.mw &&
>                 echo "my new file char[_2" >Char\[_2.mw &&
>                 git add . &&
> -               git commit -m "commiting some exotic file name..." &&
> +               git commit -m "committing some exotic file name..." &&
>                 git push
>         ) &&
>         wiki_getallpage ref_page_14 &&
Previous: Stefano LattariniNext: Stefano Lattarini
Message 2 of 34 in “Various typofixes”
  1. Various typofixesStefano Lattarini, Apr 11, 2013
  2. Eric SunshineApr 11, 2013
  3. Fix various typos and grammarosStefano Lattarini, Apr 11, 2013
  4. Junio C HamanoApr 12, 2013
  5. 0/10 Re: [PATCH v2] Fix various typos and grammarosJonathan Nieder, Apr 12, 2013
  6. 01/10 doc: various spelling fixesJonathan Nieder, Apr 12, 2013
  7. Junio C HamanoApr 12, 2013
  8. gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEMJakub Narębski, Apr 12, 2013
  9. Drew NorthupApr 16, 2013
  10. Junio C HamanoApr 16, 2013
  11. Jakub NarębskiApr 16, 2013
  12. Drew NorthupApr 16, 2013
  13. Drew NorthupApr 16, 2013
  14. gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityJakub Narębski, Apr 16, 2013
  15. Drew NorthupApr 16, 2013
  16. Drew NorthupApr 16, 2013
  17. Jonathan NiederApr 16, 2013
  18. Drew NorthupApr 18, 2013
  19. Junio C HamanoApr 18, 2013
  20. 02/10 git-remote-mediawiki: spelling fixesJonathan Nieder, Apr 12, 2013
  21. Matthieu MoyApr 12, 2013
  22. 03/10 contrib/subtree: fix spelling of accidentallyJonathan Nieder, Apr 12, 2013
  23. 04/10 obstack: fix spelling of similarJonathan Nieder, Apr 12, 2013
  24. 05/10 compat/regex: fix spelling and grammar in commentsJonathan Nieder, Apr 12, 2013
  25. 06/10 compat/nedmalloc: fix spelling in commentsJonathan Nieder, Apr 12, 2013
  26. Sebastian SchuberthApr 12, 2013
  27. 07/10 precompose-utf8: fix spelling of "want" in error messageJonathan Nieder, Apr 12, 2013
  28. 08/10 kwset: fix spelling in commentsJonathan Nieder, Apr 12, 2013
  29. 09/10 git-gui: fix spelling in commentsJonathan Nieder, Apr 12, 2013
  30. 10/10 Correct common spelling mistakes in comments and testsJonathan Nieder, Apr 12, 2013
  31. Junio C HamanoApr 12, 2013
  32. Junio C HamanoApr 12, 2013
  33. Stefano LattariniApr 12, 2013
  34. Junio C HamanoApr 12, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.