Changes in v4:
* small typo fix in commit message.
* convert all occurrences of '.gitmodules' to use the new macro.
Brandon Williams (10):
repo_read_index: don't discard the index
repository: have the_repository use the_index
cache.h: add GITMODULES_FILE macro
config: add config_from_gitmodules
submodule: remove submodule.fetchjobs from submodule-config parsing
submodule: remove fetch.recursesubmodules from submodule-config
parsing
submodule: check for unstaged .gitmodules outside of config parsing
submodule: check for unmerged .gitmodules outside of config parsing
submodule: merge repo_read_gitmodules and gitmodules_config
grep: recurse in-process using 'struct repository'
Documentation/git-grep.txt | 7 -
builtin/fetch.c | 26 ++-
builtin/grep.c | 396 ++++++++++----------------------------------
builtin/mv.c | 2 +-
builtin/rm.c | 2 +-
builtin/submodule--helper.c | 17 +-
cache.h | 2 +-
config.c | 17 ++
config.h | 10 ++
git.c | 2 +-
grep.c | 13 --
grep.h | 1 -
repository.c | 6 +-
repository.h | 8 +
setup.c | 12 +-
submodule-config.c | 8 +
submodule-config.h | 1 +
submodule.c | 157 ++++++++----------
submodule.h | 6 +-
unpack-trees.c | 2 +-
20 files changed, 246 insertions(+), 449 deletions(-)
--
2.14.0.rc1.383.gd1ce394fe2-goog
