diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 19:16:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 19:16:28 (GMT) |
| commit | 00c4d2b6bca954b4505221616dd3f53230f9b299 (patch) | |
| tree | 4fa20727a7f4f1c2db4c9638567ebce9a1eda6cf /builtin | |
| parent | 237aa99cd26da4daf9b2e75914ae17ecc9051f0c (diff) | |
| parent | e724197f236aa1a4fa87a8e7dd1377dbd0199307 (diff) | |
| download | git-00c4d2b6bca954b4505221616dd3f53230f9b299.zip git-00c4d2b6bca954b4505221616dd3f53230f9b299.tar.gz git-00c4d2b6bca954b4505221616dd3f53230f9b299.tar.bz2 | |
Merge branch 'bw/submodule-sans-cache-compat'
Code clean-up.
* bw/submodule-sans-cache-compat:
submodule: convert get_next_submodule to not rely on the_index
submodule: used correct index in is_staging_gitmodules_ok
submodule: convert stage_updated_gitmodules to take a struct index_state
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fetch.c | 4 | ||||
| -rw-r--r-- | builtin/mv.c | 2 | ||||
| -rw-r--r-- | builtin/rm.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index e705237..e656746 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -3,6 +3,7 @@ */ #include "cache.h" #include "config.h" +#include "repository.h" #include "refs.h" #include "commit.h" #include "builtin.h" @@ -1397,7 +1398,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) struct argv_array options = ARGV_ARRAY_INIT; add_options_to_argv(&options); - result = fetch_populated_submodules(&options, + result = fetch_populated_submodules(the_repository, + &options, submodule_prefix, recurse_submodules, recurse_submodules_default, diff --git a/builtin/mv.c b/builtin/mv.c index ffdd5f0..cf3684d 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -291,7 +291,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) } if (gitmodules_modified) - stage_updated_gitmodules(); + stage_updated_gitmodules(&the_index); if (active_cache_changed && write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) diff --git a/builtin/rm.c b/builtin/rm.c index d91451f..4a2fcca 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -382,7 +382,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) } strbuf_release(&buf); if (gitmodules_modified) - stage_updated_gitmodules(); + stage_updated_gitmodules(&the_index); } if (active_cache_changed) { |