diff options
| author | Brandon Williams <bmwill@google.com> | 2017-08-02 21:49:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-02 23:26:46 +0200 |
| commit | 4c0eeafe4755345b0f4636bf09904cf689703e11 (patch) | |
| tree | 3465ad439611ae2ff94563878bd8e7c6f5f518de /unpack-trees.c | |
| parent | repository: have the_repository use the_index (diff) | |
| download | git-4c0eeafe4755345b0f4636bf09904cf689703e11.tar.xz git-4c0eeafe4755345b0f4636bf09904cf689703e11.zip | |
cache.h: add GITMODULES_FILE macro
Add a macro to be used when specifying the '.gitmodules' file and
convert any existing hard coded '.gitmodules' file strings to use the
new macro.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 dd535bc849..05335fe5bf 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) { |