From 3b8317a9e6f1538c99074eeffd4b27ac18de5648 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 12 Dec 2017 11:53:50 -0800 Subject: submodule: convert stage_updated_gitmodules to take a struct index_state Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- submodule.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index 95e6aff2bb..7097be806e 100644 --- a/submodule.c +++ b/submodule.c @@ -143,9 +143,9 @@ int remove_path_from_gitmodules(const char *path) return 0; } -void stage_updated_gitmodules(void) +void stage_updated_gitmodules(struct index_state *istate) { - if (add_file_to_cache(GITMODULES_FILE, 0)) + if (add_file_to_index(istate, GITMODULES_FILE, 0)) die(_("staging updated .gitmodules failed")); } -- cgit v1.2.1 From 7da9aba417868afa11ef0baa4078dc2dadde5333 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 12 Dec 2017 11:53:51 -0800 Subject: submodule: used correct index in is_staging_gitmodules_ok Commit 883e248b8 (fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files., 2017-09-22) introduced a call to 'ce_match_stat()' in 'is_staging_gitmodules_ok()' which implicitly relys on the the global 'the_index' instead of the passed in 'struct index_state'. Fix this by changing the call to 'ie_match_stat()' and using the passed in index_state struct. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- submodule.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index 7097be806e..a9670eaae8 100644 --- a/submodule.c +++ b/submodule.c @@ -55,14 +55,15 @@ int is_gitmodules_unmerged(const struct index_state *istate) * future version when we learn to stage the changes we do ourselves without * staging any previous modifications. */ -int is_staging_gitmodules_ok(const struct index_state *istate) +int is_staging_gitmodules_ok(struct index_state *istate) { int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE)); if ((pos >= 0) && (pos < istate->cache_nr)) { struct stat st; if (lstat(GITMODULES_FILE, &st) == 0 && - ce_match_stat(istate->cache[pos], &st, CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED) + ie_match_stat(istate, istate->cache[pos], &st, + CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED) return 0; } -- cgit v1.2.1 From e724197f236aa1a4fa87a8e7dd1377dbd0199307 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 12 Dec 2017 11:53:52 -0800 Subject: submodule: convert get_next_submodule to not rely on the_index Instead of implicitly relying on the global 'the_index', convert 'get_next_submodule()' to use the index of the repository stored in the callback data 'struct submodule_parallel_fetch'. Since this removes the last user of the index compatibility macros, define 'NO_THE_INDEX_COMPATIBILITY_MACROS' to prevent future users of these macros in submodule.c. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- submodule.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index a9670eaae8..59372eada8 100644 --- a/submodule.c +++ b/submodule.c @@ -1,3 +1,5 @@ +#define NO_THE_INDEX_COMPATIBILITY_MACROS + #include "cache.h" #include "repository.h" #include "config.h" @@ -1179,7 +1181,7 @@ int submodule_touches_in_range(struct object_id *excl_oid, struct submodule_parallel_fetch { int count; struct argv_array args; - const char *work_tree; + struct repository *r; const char *prefix; int command_line_option; int default_option; @@ -1200,7 +1202,7 @@ static int get_fetch_recurse_config(const struct submodule *submodule, int fetch_recurse = submodule->fetch_recurse; key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name); - if (!repo_config_get_string_const(the_repository, key, &value)) { + if (!repo_config_get_string_const(spf->r, key, &value)) { fetch_recurse = parse_fetch_recurse_submodules_arg(key, value); } free(key); @@ -1219,11 +1221,11 @@ static int get_next_submodule(struct child_process *cp, int ret = 0; struct submodule_parallel_fetch *spf = data; - for (; spf->count < active_nr; spf->count++) { + for (; spf->count < spf->r->index->cache_nr; spf->count++) { struct strbuf submodule_path = STRBUF_INIT; struct strbuf submodule_git_dir = STRBUF_INIT; struct strbuf submodule_prefix = STRBUF_INIT; - const struct cache_entry *ce = active_cache[spf->count]; + const struct cache_entry *ce = spf->r->index->cache[spf->count]; const char *git_dir, *default_argv; const struct submodule *submodule; struct submodule default_submodule = SUBMODULE_INIT; @@ -1231,7 +1233,7 @@ static int get_next_submodule(struct child_process *cp, if (!S_ISGITLINK(ce->ce_mode)) continue; - submodule = submodule_from_path(&null_oid, ce->name); + submodule = submodule_from_cache(spf->r, &null_oid, ce->name); if (!submodule) { const char *name = default_name_or_path(ce->name); if (name) { @@ -1257,7 +1259,7 @@ static int get_next_submodule(struct child_process *cp, continue; } - strbuf_addf(&submodule_path, "%s/%s", spf->work_tree, ce->name); + strbuf_repo_worktree_path(&submodule_path, spf->r, "%s", ce->name); strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf); strbuf_addf(&submodule_prefix, "%s%s/", spf->prefix, ce->name); git_dir = read_gitfile(submodule_git_dir.buf); @@ -1310,7 +1312,8 @@ static int fetch_finish(int retvalue, struct strbuf *err, return 0; } -int fetch_populated_submodules(const struct argv_array *options, +int fetch_populated_submodules(struct repository *r, + const struct argv_array *options, const char *prefix, int command_line_option, int default_option, int quiet, int max_parallel_jobs) @@ -1318,16 +1321,16 @@ int fetch_populated_submodules(const struct argv_array *options, int i; struct submodule_parallel_fetch spf = SPF_INIT; - spf.work_tree = get_git_work_tree(); + spf.r = r; spf.command_line_option = command_line_option; spf.default_option = default_option; spf.quiet = quiet; spf.prefix = prefix; - if (!spf.work_tree) + if (!r->worktree) goto out; - if (read_cache() < 0) + if (repo_read_index(r) < 0) die("index file corrupt"); argv_array_push(&spf.args, "fetch"); -- cgit v1.2.1