diff options
| author | Brandon Williams <bmwill@google.com> | 2017-08-03 18:19:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-03 20:11:01 (GMT) |
| commit | 7463e2ec3e932707b70b5d5c82df51bfbb6aa77d (patch) | |
| tree | 7be63250f394c161f96f9c2a64ce8f3f77d998d4 /submodule.c | |
| parent | fdfa9e97dbffdc6868a1a046456c0ad67dda9e29 (diff) | |
| download | git-7463e2ec3e932707b70b5d5c82df51bfbb6aa77d.zip git-7463e2ec3e932707b70b5d5c82df51bfbb6aa77d.tar.gz git-7463e2ec3e932707b70b5d5c82df51bfbb6aa77d.tar.bz2 | |
unpack-trees: don't respect submodule.update
The 'submodule.update' config was historically used and respected by the
'submodule update' command because update handled a variety of different
ways it updated a submodule. As we begin teaching other commands about
submodules it makes more sense for the different settings of
'submodule.update' to be handled by the individual commands themselves
(checkout, rebase, merge, etc) so it shouldn't be respected by the
native checkout command.
Also remove the overlaying of the repository's config (via using
'submodule_config()') from the commands which use the unpack-trees
logic (checkout, read-tree, reset).
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index a320438..f913c23 100644 --- a/submodule.c +++ b/submodule.c @@ -235,7 +235,6 @@ void load_submodule_cache(void) return; gitmodules_config(); - git_config(submodule_config, NULL); } static int gitmodules_cb(const char *var, const char *value, void *data) |