diff options
| author |  Antonio Ospite <ao2@ao2.it> | 2018-06-26 12:47:10 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-26 13:16:35 -0700 |
| commit | db64d1127f5c76b721830ba390176cf0d6e59d74 (patch) | |
| tree | 8fc531245274ba87fb456f8442b26c4abf128b6c /Documentation/git-merge-tree.txt | |
| parent | submodule-config: pass repository as argument to config_from_gitmodules (diff) | |
| download | tgif-db64d1127f5c76b721830ba390176cf0d6e59d74.tar.xz | |
submodule-config: reuse config_from_gitmodules in repo_read_gitmodules
Reuse config_from_gitmodules in repo_read_gitmodules to remove some
duplication and also have a single point where the .gitmodules file is
read.
The change does not introduce any new behavior, the same gitmodules_cb
config callback is still used, which only deals with configuration
specific to submodules.
The check about the repo's worktree is removed from repo_read_gitmodules
because it's already performed in config_from_gitmodules.
The config_from_gitmodules function is moved up in the file —unchanged—
before its users to avoid a forward declaration.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
Acked-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions