diff options
| -rw-r--r-- | submodule-config.h | 3 | ||||
| -rw-r--r-- | submodule.c | 138 | ||||
| -rwxr-xr-x | t/t5526-fetch-submodules.sh | 35 |
3 files changed, 138 insertions, 38 deletions
diff --git a/submodule-config.h b/submodule-config.h index e3845831f6..a5503a5d17 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -22,6 +22,9 @@ struct submodule { int recommend_shallow; }; +#define SUBMODULE_INIT { NULL, NULL, NULL, RECURSE_SUBMODULES_NONE, \ + NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, {0}, -1 }; + struct submodule_cache; struct repository; diff --git a/submodule.c b/submodule.c index 63e7094e16..71d1773e2e 100644 --- a/submodule.c +++ b/submodule.c @@ -21,7 +21,7 @@ #include "parse-options.h" static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF; -static struct string_list changed_submodule_paths = STRING_LIST_INIT_DUP; +static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP; static int initialized_fetch_ref_tips; static struct oid_array ref_tips_before_fetch; static struct oid_array ref_tips_after_fetch; @@ -674,11 +674,11 @@ const struct submodule *submodule_from_ce(const struct cache_entry *ce) } static struct oid_array *submodule_commits(struct string_list *submodules, - const char *path) + const char *name) { struct string_list_item *item; - item = string_list_insert(submodules, path); + item = string_list_insert(submodules, name); if (item->util) return (struct oid_array *) item->util; @@ -687,39 +687,67 @@ static struct oid_array *submodule_commits(struct string_list *submodules, return (struct oid_array *) item->util; } +struct collect_changed_submodules_cb_data { + struct string_list *changed; + const struct object_id *commit_oid; +}; + +/* + * this would normally be two functions: default_name_from_path() and + * path_from_default_name(). Since the default name is the same as + * the submodule path we can get away with just one function which only + * checks whether there is a submodule in the working directory at that + * location. + */ +static const char *default_name_or_path(const char *path_or_name) +{ + int error_code; + + if (!is_submodule_populated_gently(path_or_name, &error_code)) + return NULL; + + return path_or_name; +} + static void collect_changed_submodules_cb(struct diff_queue_struct *q, struct diff_options *options, void *data) { + struct collect_changed_submodules_cb_data *me = data; + struct string_list *changed = me->changed; + const struct object_id *commit_oid = me->commit_oid; int i; - struct string_list *changed = data; for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; struct oid_array *commits; + const struct submodule *submodule; + const char *name; + if (!S_ISGITLINK(p->two->mode)) continue; - if (S_ISGITLINK(p->one->mode)) { - /* - * NEEDSWORK: We should honor the name configured in - * the .gitmodules file of the commit we are examining - * here to be able to correctly follow submodules - * being moved around. - */ - commits = submodule_commits(changed, p->two->path); - oid_array_append(commits, &p->two->oid); - } else { - /* Submodule is new or was moved here */ - /* - * NEEDSWORK: When the .git directories of submodules - * live inside the superprojects .git directory some - * day we should fetch new submodules directly into - * that location too when config or options request - * that so they can be checked out from there. - */ - continue; + submodule = submodule_from_path(commit_oid, p->two->path); + if (submodule) + name = submodule->name; + else { + name = default_name_or_path(p->two->path); + /* make sure name does not collide with existing one */ + submodule = submodule_from_name(commit_oid, name); + if (submodule) { + warning("Submodule in commit %s at path: " + "'%s' collides with a submodule named " + "the same. Skipping it.", + oid_to_hex(commit_oid), name); + name = NULL; + } } + + if (!name) + continue; + + commits = submodule_commits(changed, name); + oid_array_append(commits, &p->two->oid); } } @@ -742,11 +770,14 @@ static void collect_changed_submodules(struct string_list *changed, while ((commit = get_revision(&rev))) { struct rev_info diff_rev; + struct collect_changed_submodules_cb_data data; + data.changed = changed; + data.commit_oid = &commit->object.oid; init_revisions(&diff_rev, NULL); diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; diff_rev.diffopt.format_callback = collect_changed_submodules_cb; - diff_rev.diffopt.format_callback_data = changed; + diff_rev.diffopt.format_callback_data = &data; diff_tree_combined_merge(commit, 1, &diff_rev); } @@ -894,7 +925,7 @@ int find_unpushed_submodules(struct oid_array *commits, const char *remotes_name, struct string_list *needs_pushing) { struct string_list submodules = STRING_LIST_INIT_DUP; - struct string_list_item *submodule; + struct string_list_item *name; struct argv_array argv = ARGV_ARRAY_INIT; /* argv.argv[0] will be ignored by setup_revisions */ @@ -905,9 +936,19 @@ int find_unpushed_submodules(struct oid_array *commits, collect_changed_submodules(&submodules, &argv); - for_each_string_list_item(submodule, &submodules) { - struct oid_array *commits = submodule->util; - const char *path = submodule->string; + for_each_string_list_item(name, &submodules) { + struct oid_array *commits = name->util; + const struct submodule *submodule; + const char *path = NULL; + + submodule = submodule_from_name(&null_oid, name->string); + if (submodule) + path = submodule->path; + else + path = default_name_or_path(name->string); + + if (!path) + continue; if (submodule_needs_pushing(path, commits)) string_list_insert(needs_pushing, path); @@ -1065,7 +1106,7 @@ static void calculate_changed_submodule_paths(void) { struct argv_array argv = ARGV_ARRAY_INIT; struct string_list changed_submodules = STRING_LIST_INIT_DUP; - const struct string_list_item *item; + const struct string_list_item *name; /* No need to check if there are no submodules configured */ if (!submodule_from_path(NULL, NULL)) @@ -1080,16 +1121,26 @@ static void calculate_changed_submodule_paths(void) /* * Collect all submodules (whether checked out or not) for which new - * commits have been recorded upstream in "changed_submodule_paths". + * commits have been recorded upstream in "changed_submodule_names". */ collect_changed_submodules(&changed_submodules, &argv); - for_each_string_list_item(item, &changed_submodules) { - struct oid_array *commits = item->util; - const char *path = item->string; + for_each_string_list_item(name, &changed_submodules) { + struct oid_array *commits = name->util; + const struct submodule *submodule; + const char *path = NULL; + + submodule = submodule_from_name(&null_oid, name->string); + if (submodule) + path = submodule->path; + else + path = default_name_or_path(name->string); + + if (!path) + continue; if (!submodule_has_commits(path, commits)) - string_list_append(&changed_submodule_paths, path); + string_list_append(&changed_submodule_names, name->string); } free_submodules_oids(&changed_submodules); @@ -1149,11 +1200,19 @@ static int get_next_submodule(struct child_process *cp, const struct cache_entry *ce = active_cache[spf->count]; const char *git_dir, *default_argv; const struct submodule *submodule; + struct submodule default_submodule = SUBMODULE_INIT; if (!S_ISGITLINK(ce->ce_mode)) continue; submodule = submodule_from_path(&null_oid, ce->name); + if (!submodule) { + const char *name = default_name_or_path(ce->name); + if (name) { + default_submodule.path = default_submodule.name = name; + submodule = &default_submodule; + } + } default_argv = "yes"; if (spf->command_line_option == RECURSE_SUBMODULES_DEFAULT) { @@ -1175,7 +1234,8 @@ static int get_next_submodule(struct child_process *cp, if (fetch_recurse == RECURSE_SUBMODULES_OFF) continue; if (fetch_recurse == RECURSE_SUBMODULES_ON_DEMAND) { - if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name)) + if (!unsorted_string_list_lookup(&changed_submodule_names, + submodule->name)) continue; default_argv = "on-demand"; } @@ -1183,13 +1243,15 @@ static int get_next_submodule(struct child_process *cp, if (spf->default_option == RECURSE_SUBMODULES_OFF) continue; if (spf->default_option == RECURSE_SUBMODULES_ON_DEMAND) { - if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name)) + if (!unsorted_string_list_lookup(&changed_submodule_names, + submodule->name)) continue; default_argv = "on-demand"; } } } else if (spf->command_line_option == RECURSE_SUBMODULES_ON_DEMAND) { - if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name)) + if (!unsorted_string_list_lookup(&changed_submodule_names, + submodule->name)) continue; default_argv = "on-demand"; } @@ -1282,7 +1344,7 @@ int fetch_populated_submodules(const struct argv_array *options, argv_array_clear(&spf.args); out: - string_list_clear(&changed_submodule_paths, 1); + string_list_clear(&changed_submodule_names, 1); return spf.result; } diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 43a22f680f..a552ad4ead 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -570,4 +570,39 @@ test_expect_success 'fetching submodule into a broken repository' ' test_must_fail git -C dst fetch --recurse-submodules ' +test_expect_success "fetch new commits when submodule got renamed" ' + git clone . downstream_rename && + ( + cd downstream_rename && + git submodule update --init && +# NEEDSWORK: we omitted --recursive for the submodule update here since +# that does not work. See test 7001 for mv "moving nested submodules" +# for details. Once that is fixed we should add the --recursive option +# here. + git checkout -b rename && + git mv submodule submodule_renamed && + ( + cd submodule_renamed && + git checkout -b rename_sub && + echo a >a && + git add a && + git commit -ma && + git push origin rename_sub && + git rev-parse HEAD >../../expect + ) && + git add submodule_renamed && + git commit -m "update renamed submodule" && + git push origin rename + ) && + ( + cd downstream && + git fetch --recurse-submodules=on-demand && + ( + cd submodule && + git rev-parse origin/rename_sub >../../actual + ) + ) && + test_cmp expect actual +' + test_done |