git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: "Robert P. J. Day" <rpjday@crashcourse.ca>
Cc: Git Mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] Correct mispellings of ".gitmodule" to ".gitmodules"
Date: Tue, 13 Feb 2018 15:45:25 -0800	[thread overview]
Message-ID: <CAGZ79kY7a0zFkatY4vvTAGjFnvr43EWkFC_RW0O-Lp4e+dwOPA@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.2.21.1802131831410.16573@localhost.localdomain>

On Tue, Feb 13, 2018 at 3:33 PM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
> There are a small number of misspellings, ".gitmodule", scattered
> throughout the code base, correct them ... no apparent functional
> changes.

Thanks for catching these!


>  Documentation/technical/api-submodule-config.txt | 2 +-
>  contrib/subtree/git-subtree.txt                  | 2 +-
>  submodule-config.c                               | 4 ++--
>  t/t5526-fetch-submodules.sh                      | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)

Please sign off your patch. (See Documentation/SubmittingPatches)

>
> ---
>
>   fairly brainless correction of what appear to be minor misspellings.

the code looks good.

Thanks,
Stefan

>
> diff --git a/Documentation/technical/api-submodule-config.txt b/Documentation/technical/api-submodule-config.txt
> index 3dce003fd..ee907c4a8 100644
> --- a/Documentation/technical/api-submodule-config.txt
> +++ b/Documentation/technical/api-submodule-config.txt
> @@ -4,7 +4,7 @@ submodule config cache API
>  The submodule config cache API allows to read submodule
>  configurations/information from specified revisions. Internally
>  information is lazily read into a cache that is used to avoid
> -unnecessary parsing of the same .gitmodule files. Lookups can be done by
> +unnecessary parsing of the same .gitmodules files. Lookups can be done by
>  submodule path or name.
>
>  Usage
> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index 60d76cddd..352deda69 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -28,7 +28,7 @@ as a subdirectory of your application.
>
>  Subtrees are not to be confused with submodules, which are meant for
>  the same task. Unlike submodules, subtrees do not need any special
> -constructions (like .gitmodule files or gitlinks) be present in
> +constructions (like .gitmodules files or gitlinks) be present in
>  your repository, and do not force end-users of your
>  repository to do anything special or to understand how subtrees
>  work. A subtree is just a subdirectory that can be
> diff --git a/submodule-config.c b/submodule-config.c
> index 2aa8a1747..602ba8ca8 100644
> --- a/submodule-config.c
> +++ b/submodule-config.c
> @@ -9,7 +9,7 @@
>  /*
>   * submodule cache lookup structure
>   * There is one shared set of 'struct submodule' entries which can be
> - * looked up by their sha1 blob id of the .gitmodule file and either
> + * looked up by their sha1 blob id of the .gitmodules file and either
>   * using path or name as key.
>   * for_path stores submodule entries with path as key
>   * for_name stores submodule entries with name as key
> @@ -91,7 +91,7 @@ static void submodule_cache_clear(struct submodule_cache *cache)
>         /*
>          * We iterate over the name hash here to be symmetric with the
>          * allocation of struct submodule entries. Each is allocated by
> -        * their .gitmodule blob sha1 and submodule name.
> +        * their .gitmodules blob sha1 and submodule name.
>          */
>         hashmap_iter_init(&cache->for_name, &iter);
>         while ((entry = hashmap_iter_next(&iter)))
> diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
> index a552ad4ea..74486c73b 100755
> --- a/t/t5526-fetch-submodules.sh
> +++ b/t/t5526-fetch-submodules.sh
> @@ -485,7 +485,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
>         )
>  '
>
> -test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodule entry" '
> +test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" '
>         (
>                 cd downstream &&
>                 git fetch --recurse-submodules
>
> --
>
> ========================================================================
> Robert P. J. Day                                 Ottawa, Ontario, CANADA
>                         http://crashcourse.ca
>
> Twitter:                                       http://twitter.com/rpjday
> LinkedIn:                               http://ca.linkedin.com/in/rpjday
> ========================================================================

      reply	other threads:[~2018-02-13 23:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-13 23:33 [PATCH] Correct mispellings of ".gitmodule" to ".gitmodules" Robert P. J. Day
2018-02-13 23:45 ` Stefan Beller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAGZ79kY7a0zFkatY4vvTAGjFnvr43EWkFC_RW0O-Lp4e+dwOPA@mail.gmail.com \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=rpjday@crashcourse.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).