* [PATCH v2] Correct mispellings of ".gitmodule" to ".gitmodules"
@ 2018-02-14 0:09 Robert P. J. Day
2018-02-14 19:37 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Robert P. J. Day @ 2018-02-14 0:09 UTC (permalink / raw)
To: Git Mailing list
There are a small number of misspellings, ".gitmodule", scattered
throughout the code base, correct them ... no apparent functional
changes.
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(-)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
can't believe i forgot to sign my own patch. le *sigh* ...
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
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Correct mispellings of ".gitmodule" to ".gitmodules"
2018-02-14 0:09 [PATCH v2] Correct mispellings of ".gitmodule" to ".gitmodules" Robert P. J. Day
@ 2018-02-14 19:37 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2018-02-14 19:37 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: Git Mailing list
"Robert P. J. Day" <rpjday@crashcourse.ca> writes:
> There are a small number of misspellings, ".gitmodule", scattered
> throughout the code base, correct them ... no apparent functional
> changes.
>
> 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(-)
>
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
>
> ---
>
> can't believe i forgot to sign my own patch. le *sigh* ...
>
> diff --git a/Documentation/technical/api-submodule-config.txt b/Documentation/technical/api-submodule-config.txt
Just for future reference, the diffstat and summary comes _after_
the three-dash line, before which is your sign-off, and after which
you can have additional comment like "can't believe...".
No need to resend, as I can remove the cruft from the log message
while queuing.
Thanks. The patch looks good. Will queue.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-14 19:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-14 0:09 [PATCH v2] Correct mispellings of ".gitmodule" to ".gitmodules" Robert P. J. Day
2018-02-14 19:37 ` Junio C Hamano
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 NNTP newsgroup(s).