Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Correct mispellings of ".gitmodule" to ".gitmodules"
author
Robert P. J. Day
<rpjday@crashcourse.ca>
Wed, 14 Feb 2018 00:09:31 +0000
(19:09 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 14 Feb 2018 19:34:34 +0000
(11:34 -0800)
There are a small number of misspellings, ".gitmodule", scattered
throughout the code base, correct them ... no apparent functional
changes.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/technical/api-submodule-config.txt
patch
|
blob
|
history
contrib/subtree/git-subtree.txt
patch
|
blob
|
history
submodule-config.c
patch
|
blob
|
history
t/t5526-fetch-submodules.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c9a800a
)
diff --git
a/Documentation/technical/api-submodule-config.txt
b/Documentation/technical/api-submodule-config.txt
index 3dce003fda008e61c7a91c85554f9a1cafe6106f..ee907c4a82a9127c0abc67b8a5dd215a3b0535d4 100644
(file)
--- 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
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 .gitmodule
s
files. Lookups can be done by
submodule path or name.
Usage
submodule path or name.
Usage
diff --git
a/contrib/subtree/git-subtree.txt
b/contrib/subtree/git-subtree.txt
index 60d76cdddfc75f0c77d5798ac0b1adc6b0e93899..352deda69dcfd009ff025615dff07dd0a5d015d1 100644
(file)
--- 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
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 .gitmodule
s
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
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 2aa8a1747f8586839aa3036fbbc59f6c716c6128..602ba8ca8b8455df9b34e2990397c838d542569f 100644
(file)
--- 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
/*
* 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 .gitmodule
s
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
* 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
/*
* 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 .gitmodule
s
blob sha1 and submodule name.
*/
hashmap_iter_init(&cache->for_name, &iter);
while ((entry = hashmap_iter_next(&iter)))
*/
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 a552ad4ead899fbb431c68bef558811d25cd8c63..74486c73b0bcc20ee69e49d5c1cc072994e4d7b0 100755
(executable)
--- 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 .gitmodule
s
entry" '
(
cd downstream &&
git fetch --recurse-submodules
(
cd downstream &&
git fetch --recurse-submodules