clone: read new remote name from remote_name instead of option_origin
In a future patch, the name of the remote created by `git clone` may come from multiple sources. To avoid confusion, convert most uses of option_origin to remote_name, leaving option_origin to exclusively represent the -o/--origin option. Helped-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Sean Barag <sean@barag.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ebe7e28a36
commit
75ca3906b1
@ -53,6 +53,7 @@ static int option_shallow_submodules;
|
|||||||
static int deepen;
|
static int deepen;
|
||||||
static char *option_template, *option_depth, *option_since;
|
static char *option_template, *option_depth, *option_since;
|
||||||
static char *option_origin = NULL;
|
static char *option_origin = NULL;
|
||||||
|
static char *remote_name = "origin";
|
||||||
static char *option_branch = NULL;
|
static char *option_branch = NULL;
|
||||||
static struct string_list option_not = STRING_LIST_INIT_NODUP;
|
static struct string_list option_not = STRING_LIST_INIT_NODUP;
|
||||||
static const char *real_git_dir;
|
static const char *real_git_dir;
|
||||||
@ -721,7 +722,7 @@ static void update_head(const struct ref *our, const struct ref *remote,
|
|||||||
if (!option_bare) {
|
if (!option_bare) {
|
||||||
update_ref(msg, "HEAD", &our->old_oid, NULL, 0,
|
update_ref(msg, "HEAD", &our->old_oid, NULL, 0,
|
||||||
UPDATE_REFS_DIE_ON_ERR);
|
UPDATE_REFS_DIE_ON_ERR);
|
||||||
install_branch_config(0, head, option_origin, our->name);
|
install_branch_config(0, head, remote_name, our->name);
|
||||||
}
|
}
|
||||||
} else if (our) {
|
} else if (our) {
|
||||||
struct commit *c = lookup_commit_reference(the_repository,
|
struct commit *c = lookup_commit_reference(the_repository,
|
||||||
@ -919,12 +920,12 @@ static void write_refspec_config(const char *src_ref_prefix,
|
|||||||
}
|
}
|
||||||
/* Configure the remote */
|
/* Configure the remote */
|
||||||
if (value.len) {
|
if (value.len) {
|
||||||
strbuf_addf(&key, "remote.%s.fetch", option_origin);
|
strbuf_addf(&key, "remote.%s.fetch", remote_name);
|
||||||
git_config_set_multivar(key.buf, value.buf, "^$", 0);
|
git_config_set_multivar(key.buf, value.buf, "^$", 0);
|
||||||
strbuf_reset(&key);
|
strbuf_reset(&key);
|
||||||
|
|
||||||
if (option_mirror) {
|
if (option_mirror) {
|
||||||
strbuf_addf(&key, "remote.%s.mirror", option_origin);
|
strbuf_addf(&key, "remote.%s.mirror", remote_name);
|
||||||
git_config_set(key.buf, "true");
|
git_config_set(key.buf, "true");
|
||||||
strbuf_reset(&key);
|
strbuf_reset(&key);
|
||||||
}
|
}
|
||||||
@ -1009,11 +1010,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
option_no_checkout = 1;
|
option_no_checkout = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!option_origin)
|
if (option_origin)
|
||||||
option_origin = "origin";
|
remote_name = option_origin;
|
||||||
|
|
||||||
if (!valid_remote_name(option_origin))
|
if (!valid_remote_name(remote_name))
|
||||||
die(_("'%s' is not a valid remote name"), option_origin);
|
die(_("'%s' is not a valid remote name"), remote_name);
|
||||||
|
|
||||||
repo_name = argv[0];
|
repo_name = argv[0];
|
||||||
|
|
||||||
@ -1164,15 +1165,15 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
git_config_set("core.bare", "true");
|
git_config_set("core.bare", "true");
|
||||||
} else {
|
} else {
|
||||||
strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
|
strbuf_addf(&branch_top, "refs/remotes/%s/", remote_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
strbuf_addf(&key, "remote.%s.url", option_origin);
|
strbuf_addf(&key, "remote.%s.url", remote_name);
|
||||||
git_config_set(key.buf, repo);
|
git_config_set(key.buf, repo);
|
||||||
strbuf_reset(&key);
|
strbuf_reset(&key);
|
||||||
|
|
||||||
if (option_no_tags) {
|
if (option_no_tags) {
|
||||||
strbuf_addf(&key, "remote.%s.tagOpt", option_origin);
|
strbuf_addf(&key, "remote.%s.tagOpt", remote_name);
|
||||||
git_config_set(key.buf, "--no-tags");
|
git_config_set(key.buf, "--no-tags");
|
||||||
strbuf_reset(&key);
|
strbuf_reset(&key);
|
||||||
}
|
}
|
||||||
@ -1183,7 +1184,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
if (option_sparse_checkout && git_sparse_checkout_init(dir))
|
if (option_sparse_checkout && git_sparse_checkout_init(dir))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
remote = remote_get(option_origin);
|
remote = remote_get(remote_name);
|
||||||
|
|
||||||
strbuf_addf(&default_refspec, "+%s*:%s*", src_ref_prefix,
|
strbuf_addf(&default_refspec, "+%s*:%s*", src_ref_prefix,
|
||||||
branch_top.buf);
|
branch_top.buf);
|
||||||
@ -1296,7 +1297,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
if (!our_head_points_at)
|
if (!our_head_points_at)
|
||||||
die(_("Remote branch %s not found in upstream %s"),
|
die(_("Remote branch %s not found in upstream %s"),
|
||||||
option_branch, option_origin);
|
option_branch, remote_name);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
our_head_points_at = remote_head_points_at;
|
our_head_points_at = remote_head_points_at;
|
||||||
@ -1304,7 +1305,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
else {
|
else {
|
||||||
if (option_branch)
|
if (option_branch)
|
||||||
die(_("Remote branch %s not found in upstream %s"),
|
die(_("Remote branch %s not found in upstream %s"),
|
||||||
option_branch, option_origin);
|
option_branch, remote_name);
|
||||||
|
|
||||||
warning(_("You appear to have cloned an empty repository."));
|
warning(_("You appear to have cloned an empty repository."));
|
||||||
mapped_refs = NULL;
|
mapped_refs = NULL;
|
||||||
@ -1316,7 +1317,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
const char *branch = git_default_branch_name();
|
const char *branch = git_default_branch_name();
|
||||||
char *ref = xstrfmt("refs/heads/%s", branch);
|
char *ref = xstrfmt("refs/heads/%s", branch);
|
||||||
|
|
||||||
install_branch_config(0, branch, option_origin, ref);
|
install_branch_config(0, branch, remote_name, ref);
|
||||||
free(ref);
|
free(ref);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1325,7 +1326,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
remote_head_points_at, &branch_top);
|
remote_head_points_at, &branch_top);
|
||||||
|
|
||||||
if (filter_options.choice)
|
if (filter_options.choice)
|
||||||
partial_clone_register(option_origin, &filter_options);
|
partial_clone_register(remote_name, &filter_options);
|
||||||
|
|
||||||
if (is_local)
|
if (is_local)
|
||||||
clone_local(path, git_dir);
|
clone_local(path, git_dir);
|
||||||
|
Loading…
Reference in New Issue
Block a user