mirror of
https://github.com/git/git.git
synced 2026-01-10 18:20:27 +00:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
e759275c8f
commit
fedfb0735b
@@ -41,22 +41,6 @@
|
|||||||
typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
|
typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
|
||||||
void *cb_data);
|
void *cb_data);
|
||||||
|
|
||||||
static int get_default_remote_submodule(const char *module_path, char **default_remote)
|
|
||||||
{
|
|
||||||
struct repository subrepo;
|
|
||||||
|
|
||||||
if (repo_submodule_init(&subrepo, the_repository, module_path,
|
|
||||||
null_oid(the_hash_algo)) < 0)
|
|
||||||
return die_message(_("could not get a repository handle for submodule '%s'"),
|
|
||||||
module_path);
|
|
||||||
|
|
||||||
*default_remote = xstrdup(repo_default_remote(&subrepo));
|
|
||||||
|
|
||||||
repo_clear(&subrepo);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static char *get_default_remote(void)
|
static char *get_default_remote(void)
|
||||||
{
|
{
|
||||||
return xstrdup(repo_default_remote(the_repository));
|
return xstrdup(repo_default_remote(the_repository));
|
||||||
@@ -86,6 +70,22 @@ static char *resolve_relative_url(const char *rel_url, const char *up_path, int
|
|||||||
return resolved_url;
|
return resolved_url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int get_default_remote_submodule(const char *module_path, char **default_remote)
|
||||||
|
{
|
||||||
|
struct repository subrepo;
|
||||||
|
|
||||||
|
if (repo_submodule_init(&subrepo, the_repository, module_path,
|
||||||
|
null_oid(the_hash_algo)) < 0)
|
||||||
|
return die_message(_("could not get a repository handle for submodule '%s'"),
|
||||||
|
module_path);
|
||||||
|
|
||||||
|
*default_remote = xstrdup(repo_default_remote(&subrepo));
|
||||||
|
|
||||||
|
repo_clear(&subrepo);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* the result should be freed by the caller. */
|
/* the result should be freed by the caller. */
|
||||||
static char *get_submodule_displaypath(const char *path, const char *prefix,
|
static char *get_submodule_displaypath(const char *path, const char *prefix,
|
||||||
const char *super_prefix)
|
const char *super_prefix)
|
||||||
|
|||||||
Reference in New Issue
Block a user