From: Brandon Williams <bmwill@google.com>
Date: Wed, 2 Aug 2017 19:49:22 +0000 (-0700)
Subject: submodule: merge repo_read_gitmodules and gitmodules_config
X-Git-Tag: v2.15.0-rc0~179^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2184d4ba0cb86a7f40153cd46b03d3fa75b247d9?hp=2184d4ba0cb86a7f40153cd46b03d3fa75b247d9

submodule: merge repo_read_gitmodules and gitmodules_config

Since 69aba5329 (submodule: add repo_read_gitmodules) there have been
two ways to load a repository's .gitmodules file:
'repo_read_gitmodules()' is used if you have a repository object you are
working with or 'gitmodules_config()' if you are implicitly working with
'the_repository'.  Merge the logic of these two functions to remove
duplicate code.

In addition, 'repo_read_gitmodules()' can segfault by passing in a NULL
pointer to 'git_config_from_file()' if a repository doesn't have a
worktree.  Instead check for the existence of a worktree before
attempting to load the .gitmodules file.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---