Git fork

submodule: move get_default_remote_submodule()

A future refactor got get_default_remote_submodule() is going to depend on
resolve_relative_url(). That function depends on get_default_remote().

Move get_default_remote_submodule() after resolve_relative_url() first
to make the additional functionality easier to review.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Jacob Keller and committed by
Junio C Hamano
fedfb073 e759275c

+16 -16
+16 -16
builtin/submodule--helper.c
··· 41 41 typedef void (*each_submodule_fn)(const struct cache_entry *list_item, 42 42 void *cb_data); 43 43 44 - static int get_default_remote_submodule(const char *module_path, char **default_remote) 45 - { 46 - struct repository subrepo; 47 - 48 - if (repo_submodule_init(&subrepo, the_repository, module_path, 49 - null_oid(the_hash_algo)) < 0) 50 - return die_message(_("could not get a repository handle for submodule '%s'"), 51 - module_path); 52 - 53 - *default_remote = xstrdup(repo_default_remote(&subrepo)); 54 - 55 - repo_clear(&subrepo); 56 - 57 - return 0; 58 - } 59 - 60 44 static char *get_default_remote(void) 61 45 { 62 46 return xstrdup(repo_default_remote(the_repository)); ··· 84 68 strbuf_release(&remotesb); 85 69 86 70 return resolved_url; 71 + } 72 + 73 + static int get_default_remote_submodule(const char *module_path, char **default_remote) 74 + { 75 + struct repository subrepo; 76 + 77 + if (repo_submodule_init(&subrepo, the_repository, module_path, 78 + null_oid(the_hash_algo)) < 0) 79 + return die_message(_("could not get a repository handle for submodule '%s'"), 80 + module_path); 81 + 82 + *default_remote = xstrdup(repo_default_remote(&subrepo)); 83 + 84 + repo_clear(&subrepo); 85 + 86 + return 0; 87 87 } 88 88 89 89 /* the result should be freed by the caller. */