diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:01 -0700 |
| commit | 5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5 (patch) | |
| tree | a0eaaf3110e43b2a4aec5f7023fbf62a655418de /unpack-trees.c | |
| parent | 1016495a7190911b37c354f7a985278c51ae6666 (diff) | |
| parent | f9ee2fcdfa05586b6a4476c7aa5f4f0162e48455 (diff) | |
| download | git-5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5.tar.gz git-5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5.tar.xz | |
Merge branch 'bw/grep-recurse-submodules'
"git grep --recurse-submodules" has been reworked to give a more
consistent output across submodule boundary (and do its thing
without having to fork a separate process).
* bw/grep-recurse-submodules:
grep: recurse in-process using 'struct repository'
submodule: merge repo_read_gitmodules and gitmodules_config
submodule: check for unmerged .gitmodules outside of config parsing
submodule: check for unstaged .gitmodules outside of config parsing
submodule: remove fetch.recursesubmodules from submodule-config parsing
submodule: remove submodule.fetchjobs from submodule-config parsing
config: add config_from_gitmodules
cache.h: add GITMODULES_FILE macro
repository: have the_repository use the_index
repo_read_index: don't discard the index
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 862cfce66..38000ac8f 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -286,7 +286,7 @@ static void reload_gitmodules_file(struct index_state *index, for (i = 0; i < index->cache_nr; i++) { struct cache_entry *ce = index->cache[i]; if (ce->ce_flags & CE_UPDATE) { - int r = strcmp(ce->name, ".gitmodules"); + int r = strcmp(ce->name, GITMODULES_FILE); if (r < 0) continue; else if (r == 0) { |