git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-12 04:41:35 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'gc/remote-with-fewer-static-global-variables'

Browse Source 
Code clean-up to eventually allow information on remotes defined
for an arbitrary repository to be read.

* gc/remote-with-fewer-static-global-variables:
  remote: die if branch is not found in repository
  remote: remove the_repository->remote_state from static methods
  remote: use remote_state parameter internally
  remote: move static variables into per-repository struct
  t5516: add test case for pushing remote refspecs
This commit is contained in:
Junio C Hamano 2021-12-10 14:35:02 -08:00
commit 6d1e149ac0
5 changed files with 312 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

369
remote.c
View File

@ -21,33 +21,6 @@ struct counted_string {
size_t len; size_t len;
const char *s; const char *s;
}; };
struct rewrite {
const char *base;
size_t baselen;
struct counted_string *instead_of;
int instead_of_nr;
int instead_of_alloc;
};
struct rewrites {
struct rewrite **rewrite;
int rewrite_alloc;
int rewrite_nr;
};
static struct remote **remotes;
static int remotes_alloc;
static int remotes_nr;
static struct hashmap remotes_hash;
static struct branch **branches;
static int branches_alloc;
static int branches_nr;
static struct branch *current_branch;
static const char *pushremote_name;
static struct rewrites rewrites;
static struct rewrites rewrites_push;
static int valid_remote(const struct remote *remote) static int valid_remote(const struct remote *remote)
{ {
@ -92,17 +65,19 @@ static void add_pushurl(struct remote *remote, const char *pushurl)
remote->pushurl[remote->pushurl_nr++] = pushurl; remote->pushurl[remote->pushurl_nr++] = pushurl;
} }
static void add_pushurl_alias(struct remote *remote, const char *url) static void add_pushurl_alias(struct remote_state *remote_state,
struct remote *remote, const char *url)
{ {
const char *pushurl = alias_url(url, &rewrites_push); const char *pushurl = alias_url(url, &remote_state->rewrites_push);
if (pushurl != url) if (pushurl != url)
add_pushurl(remote, pushurl); add_pushurl(remote, pushurl);
} }
static void add_url_alias(struct remote *remote, const char *url) static void add_url_alias(struct remote_state *remote_state,
struct remote *remote, const char *url)
{ {
add_url(remote, alias_url(url, &rewrites)); add_url(remote, alias_url(url, &remote_state->rewrites));
add_pushurl_alias(remote, url); add_pushurl_alias(remote_state, remote, url);
} }
struct remotes_hash_key { struct remotes_hash_key {
@ -127,13 +102,8 @@ static int remotes_hash_cmp(const void *unused_cmp_data,
return strcmp(a->name, b->name); return strcmp(a->name, b->name);
} }
static inline void init_remotes_hash(void) static struct remote *make_remote(struct remote_state *remote_state,
{ const char *name, int len)
if (!remotes_hash.cmpfn)
hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
}
static struct remote *make_remote(const char *name, int len)
{ {
struct remote *ret; struct remote *ret;
struct remotes_hash_key lookup; struct remotes_hash_key lookup;
@ -142,12 +112,11 @@ static struct remote *make_remote(const char *name, int len)
if (!len) if (!len)
len = strlen(name); len = strlen(name);
init_remotes_hash();
lookup.str = name; lookup.str = name;
lookup.len = len; lookup.len = len;
hashmap_entry_init(&lookup_entry, memhash(name, len)); hashmap_entry_init(&lookup_entry, memhash(name, len));
e = hashmap_get(&remotes_hash, &lookup_entry, &lookup); e = hashmap_get(&remote_state->remotes_hash, &lookup_entry, &lookup);
if (e) if (e)
return container_of(e, struct remote, ent); return container_of(e, struct remote, ent);
@ -158,15 +127,38 @@ static struct remote *make_remote(const char *name, int len)
refspec_init(&ret->push, REFSPEC_PUSH); refspec_init(&ret->push, REFSPEC_PUSH);
refspec_init(&ret->fetch, REFSPEC_FETCH); refspec_init(&ret->fetch, REFSPEC_FETCH);
ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc); ALLOC_GROW(remote_state->remotes, remote_state->remotes_nr + 1,
remotes[remotes_nr++] = ret; remote_state->remotes_alloc);
remote_state->remotes[remote_state->remotes_nr++] = ret;
hashmap_entry_init(&ret->ent, lookup_entry.hash); hashmap_entry_init(&ret->ent, lookup_entry.hash);
if (hashmap_put_entry(&remotes_hash, ret, ent)) if (hashmap_put_entry(&remote_state->remotes_hash, ret, ent))
BUG("hashmap_put overwrote entry after hashmap_get returned NULL"); BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
return ret; return ret;
} }
static void remote_clear(struct remote *remote)
{
int i;
free((char *)remote->name);
free((char *)remote->foreign_vcs);
for (i = 0; i < remote->url_nr; i++) {
free((char *)remote->url[i]);
}
FREE_AND_NULL(remote->pushurl);
for (i = 0; i < remote->pushurl_nr; i++) {
free((char *)remote->pushurl[i]);
}
FREE_AND_NULL(remote->pushurl);
free((char *)remote->receivepack);
free((char *)remote->uploadpack);
FREE_AND_NULL(remote->http_proxy);
FREE_AND_NULL(remote->http_proxy_authmethod);
}
static void add_merge(struct branch *branch, const char *name) static void add_merge(struct branch *branch, const char *name)
{ {
ALLOC_GROW(branch->merge_name, branch->merge_nr + 1, ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
@ -174,23 +166,74 @@ static void add_merge(struct branch *branch, const char *name)
branch->merge_name[branch->merge_nr++] = name; branch->merge_name[branch->merge_nr++] = name;
} }
static struct branch *make_branch(const char *name, size_t len) struct branches_hash_key {
const char *str;
int len;
};
static int branches_hash_cmp(const void *unused_cmp_data,
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *keydata)
{
const struct branch *a, *b;
const struct branches_hash_key *key = keydata;
a = container_of(eptr, const struct branch, ent);
b = container_of(entry_or_key, const struct branch, ent);
if (key)
return strncmp(a->name, key->str, key->len) ||
a->name[key->len];
else
return strcmp(a->name, b->name);
}
static struct branch *find_branch(struct remote_state *remote_state,
const char *name, size_t len)
{
struct branches_hash_key lookup;
struct hashmap_entry lookup_entry, *e;
if (!len)
len = strlen(name);
lookup.str = name;
lookup.len = len;
hashmap_entry_init(&lookup_entry, memhash(name, len));
e = hashmap_get(&remote_state->branches_hash, &lookup_entry, &lookup);
if (e)
return container_of(e, struct branch, ent);
return NULL;
}
static void die_on_missing_branch(struct repository *repo,
struct branch *branch)
{
/* branch == NULL is always valid because it represents detached HEAD. */
if (branch &&
branch != find_branch(repo->remote_state, branch->name, 0))
die("branch %s was not found in the repository", branch->name);
}
static struct branch *make_branch(struct remote_state *remote_state,
const char *name, size_t len)
{ {
struct branch *ret; struct branch *ret;
int i;
for (i = 0; i < branches_nr; i++) { ret = find_branch(remote_state, name, len);
if (!strncmp(name, branches[i]->name, len) && if (ret)
!branches[i]->name[len]) return ret;
return branches[i];
}
ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
CALLOC_ARRAY(ret, 1); CALLOC_ARRAY(ret, 1);
branches[branches_nr++] = ret;
ret->name = xstrndup(name, len); ret->name = xstrndup(name, len);
ret->refname = xstrfmt("refs/heads/%s", ret->name); ret->refname = xstrfmt("refs/heads/%s", ret->name);
hashmap_entry_init(&ret->ent, memhash(name, len));
if (hashmap_put_entry(&remote_state->branches_hash, ret, ent))
BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
return ret; return ret;
} }
@ -229,7 +272,8 @@ static const char *skip_spaces(const char *s)
return s; return s;
} }
static void read_remotes_file(struct remote *remote) static void read_remotes_file(struct remote_state *remote_state,
struct remote *remote)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r"); FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
@ -244,7 +288,8 @@ static void read_remotes_file(struct remote *remote)
strbuf_rtrim(&buf); strbuf_rtrim(&buf);
if (skip_prefix(buf.buf, "URL:", &v)) if (skip_prefix(buf.buf, "URL:", &v))
add_url_alias(remote, xstrdup(skip_spaces(v))); add_url_alias(remote_state, remote,
xstrdup(skip_spaces(v)));
else if (skip_prefix(buf.buf, "Push:", &v)) else if (skip_prefix(buf.buf, "Push:", &v))
refspec_append(&remote->push, skip_spaces(v)); refspec_append(&remote->push, skip_spaces(v));
else if (skip_prefix(buf.buf, "Pull:", &v)) else if (skip_prefix(buf.buf, "Pull:", &v))
@ -254,7 +299,8 @@ static void read_remotes_file(struct remote *remote)
fclose(f); fclose(f);
} }
static void read_branches_file(struct remote *remote) static void read_branches_file(struct remote_state *remote_state,
struct remote *remote)
{ {
char *frag; char *frag;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
@ -286,7 +332,7 @@ static void read_branches_file(struct remote *remote)
else else
frag = (char *)git_default_branch_name(0); frag = (char *)git_default_branch_name(0);
add_url_alias(remote, strbuf_detach(&buf, NULL)); add_url_alias(remote_state, remote, strbuf_detach(&buf, NULL));
refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s", refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
frag, remote->name); frag, remote->name);
@ -305,10 +351,12 @@ static int handle_config(const char *key, const char *value, void *cb)
const char *subkey; const char *subkey;
struct remote *remote; struct remote *remote;
struct branch *branch; struct branch *branch;
struct remote_state *remote_state = cb;
if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) { if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
if (!name) if (!name)
return 0; return 0;
branch = make_branch(name, namelen); branch = make_branch(remote_state, name, namelen);
if (!strcmp(subkey, "remote")) { if (!strcmp(subkey, "remote")) {
return git_config_string(&branch->remote_name, key, value); return git_config_string(&branch->remote_name, key, value);
} else if (!strcmp(subkey, "pushremote")) { } else if (!strcmp(subkey, "pushremote")) {
@ -327,12 +375,14 @@ static int handle_config(const char *key, const char *value, void *cb)
if (!strcmp(subkey, "insteadof")) { if (!strcmp(subkey, "insteadof")) {
if (!value) if (!value)
return config_error_nonbool(key); return config_error_nonbool(key);
rewrite = make_rewrite(&rewrites, name, namelen); rewrite = make_rewrite(&remote_state->rewrites, name,
namelen);
add_instead_of(rewrite, xstrdup(value)); add_instead_of(rewrite, xstrdup(value));
} else if (!strcmp(subkey, "pushinsteadof")) { } else if (!strcmp(subkey, "pushinsteadof")) {
if (!value) if (!value)
return config_error_nonbool(key); return config_error_nonbool(key);
rewrite = make_rewrite(&rewrites_push, name, namelen); rewrite = make_rewrite(&remote_state->rewrites_push,
name, namelen);
add_instead_of(rewrite, xstrdup(value)); add_instead_of(rewrite, xstrdup(value));
} }
} }
@ -342,7 +392,8 @@ static int handle_config(const char *key, const char *value, void *cb)
/* Handle remote.* variables */ /* Handle remote.* variables */
if (!name && !strcmp(subkey, "pushdefault")) if (!name && !strcmp(subkey, "pushdefault"))
return git_config_string(&pushremote_name, key, value); return git_config_string(&remote_state->pushremote_name, key,
value);
if (!name) if (!name)
return 0; return 0;
@ -352,7 +403,7 @@ static int handle_config(const char *key, const char *value, void *cb)
name); name);
return 0; return 0;
} }
remote = make_remote(name, namelen); remote = make_remote(remote_state, name, namelen);
remote->origin = REMOTE_CONFIG; remote->origin = REMOTE_CONFIG;
if (current_config_scope() == CONFIG_SCOPE_LOCAL || if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
current_config_scope() == CONFIG_SCOPE_WORKTREE) current_config_scope() == CONFIG_SCOPE_WORKTREE)
@ -422,44 +473,52 @@ static int handle_config(const char *key, const char *value, void *cb)
return 0; return 0;
} }
static void alias_all_urls(void) static void alias_all_urls(struct remote_state *remote_state)
{ {
int i, j; int i, j;
for (i = 0; i < remotes_nr; i++) { for (i = 0; i < remote_state->remotes_nr; i++) {
int add_pushurl_aliases; int add_pushurl_aliases;
if (!remotes[i]) if (!remote_state->remotes[i])
continue; continue;
for (j = 0; j < remotes[i]->pushurl_nr; j++) { for (j = 0; j < remote_state->remotes[i]->pushurl_nr; j++) {
remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites); remote_state->remotes[i]->pushurl[j] =
alias_url(remote_state->remotes[i]->pushurl[j],
&remote_state->rewrites);
} }
add_pushurl_aliases = remotes[i]->pushurl_nr == 0; add_pushurl_aliases = remote_state->remotes[i]->pushurl_nr == 0;
for (j = 0; j < remotes[i]->url_nr; j++) { for (j = 0; j < remote_state->remotes[i]->url_nr; j++) {
if (add_pushurl_aliases) if (add_pushurl_aliases)
add_pushurl_alias(remotes[i], remotes[i]->url[j]); add_pushurl_alias(
remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites); remote_state, remote_state->remotes[i],
remote_state->remotes[i]->url[j]);
remote_state->remotes[i]->url[j] =
alias_url(remote_state->remotes[i]->url[j],
&remote_state->rewrites);
} }
} }
} }
static void read_config(void) static void read_config(struct repository *repo)
{ {
static int loaded;
int flag; int flag;
if (loaded) if (repo->remote_state->initialized)
return; return;
loaded = 1; repo->remote_state->initialized = 1;
current_branch = NULL; repo->remote_state->current_branch = NULL;
if (startup_info->have_repository) { if (startup_info->have_repository) {
const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag); int ignore_errno;
const char *head_ref = refs_resolve_ref_unsafe(
get_main_ref_store(repo), "HEAD", 0, NULL, &flag, &ignore_errno);
if (head_ref && (flag & REF_ISSYMREF) && if (head_ref && (flag & REF_ISSYMREF) &&
skip_prefix(head_ref, "refs/heads/", &head_ref)) { skip_prefix(head_ref, "refs/heads/", &head_ref)) {
current_branch = make_branch(head_ref, strlen(head_ref)); repo->remote_state->current_branch = make_branch(
repo->remote_state, head_ref, strlen(head_ref));
} }
} }
git_config(handle_config, NULL); repo_config(repo, handle_config, repo->remote_state);
alias_all_urls(); alias_all_urls(repo->remote_state);
} }
static int valid_remote_nick(const char *name) static int valid_remote_nick(const char *name)
@ -474,7 +533,9 @@ static int valid_remote_nick(const char *name)
return 1; return 1;
} }
const char *remote_for_branch(struct branch *branch, int *explicit) static const char *remotes_remote_for_branch(struct remote_state *remote_state,
struct branch *branch,
int *explicit)
{ {
if (branch && branch->remote_name) { if (branch && branch->remote_name) {
if (explicit) if (explicit)
@ -486,32 +547,61 @@ const char *remote_for_branch(struct branch *branch, int *explicit)
return "origin"; return "origin";
} }
const char *pushremote_for_branch(struct branch *branch, int *explicit) const char *remote_for_branch(struct branch *branch, int *explicit)
{
read_config(the_repository);
die_on_missing_branch(the_repository, branch);
return remotes_remote_for_branch(the_repository->remote_state, branch,
explicit);
}
static const char *
remotes_pushremote_for_branch(struct remote_state *remote_state,
struct branch *branch, int *explicit)
{ {
if (branch && branch->pushremote_name) { if (branch && branch->pushremote_name) {
if (explicit) if (explicit)
*explicit = 1; *explicit = 1;
return branch->pushremote_name; return branch->pushremote_name;
} }
if (pushremote_name) { if (remote_state->pushremote_name) {
if (explicit) if (explicit)
*explicit = 1; *explicit = 1;
return pushremote_name; return remote_state->pushremote_name;
} }
return remote_for_branch(branch, explicit); return remotes_remote_for_branch(remote_state, branch, explicit);
} }
const char *pushremote_for_branch(struct branch *branch, int *explicit)
{
read_config(the_repository);
die_on_missing_branch(the_repository, branch);
return remotes_pushremote_for_branch(the_repository->remote_state,
branch, explicit);
}
static struct remote *remotes_remote_get(struct remote_state *remote_state,
const char *name);
const char *remote_ref_for_branch(struct branch *branch, int for_push) const char *remote_ref_for_branch(struct branch *branch, int for_push)
{ {
read_config(the_repository);
die_on_missing_branch(the_repository, branch);
if (branch) { if (branch) {
if (!for_push) { if (!for_push) {
if (branch->merge_nr) { if (branch->merge_nr) {
return branch->merge_name[0]; return branch->merge_name[0];
} }
} else { } else {
const char *dst, *remote_name = const char *dst,
pushremote_for_branch(branch, NULL); *remote_name = remotes_pushremote_for_branch(
struct remote *remote = remote_get(remote_name); the_repository->remote_state, branch,
NULL);
struct remote *remote = remotes_remote_get(
the_repository->remote_state, remote_name);
if (remote && remote->push.nr && if (remote && remote->push.nr &&
(dst = apply_refspecs(&remote->push, (dst = apply_refspecs(&remote->push,
@ -523,41 +613,58 @@ const char *remote_ref_for_branch(struct branch *branch, int for_push)
return NULL; return NULL;
} }
static struct remote *remote_get_1(const char *name, static struct remote *
const char *(*get_default)(struct branch *, int *)) remotes_remote_get_1(struct remote_state *remote_state, const char *name,
const char *(*get_default)(struct remote_state *,
struct branch *, int *))
{ {
struct remote *ret; struct remote *ret;
int name_given = 0; int name_given = 0;
read_config();
if (name) if (name)
name_given = 1; name_given = 1;
else else
name = get_default(current_branch, &name_given); name = get_default(remote_state, remote_state->current_branch,
&name_given);
ret = make_remote(name, 0); ret = make_remote(remote_state, name, 0);
if (valid_remote_nick(name) && have_git_dir()) { if (valid_remote_nick(name) && have_git_dir()) {
if (!valid_remote(ret)) if (!valid_remote(ret))
read_remotes_file(ret); read_remotes_file(remote_state, ret);
if (!valid_remote(ret)) if (!valid_remote(ret))
read_branches_file(ret); read_branches_file(remote_state, ret);
} }
if (name_given && !valid_remote(ret)) if (name_given && !valid_remote(ret))
add_url_alias(ret, name); add_url_alias(remote_state, ret, name);
if (!valid_remote(ret)) if (!valid_remote(ret))
return NULL; return NULL;
return ret; return ret;
} }
static inline struct remote *
remotes_remote_get(struct remote_state *remote_state, const char *name)
{
return remotes_remote_get_1(remote_state, name,
remotes_remote_for_branch);
}
struct remote *remote_get(const char *name) struct remote *remote_get(const char *name)
{ {
return remote_get_1(name, remote_for_branch); read_config(the_repository);
return remotes_remote_get(the_repository->remote_state, name);
}
static inline struct remote *
remotes_pushremote_get(struct remote_state *remote_state, const char *name)
{
return remotes_remote_get_1(remote_state, name,
remotes_pushremote_for_branch);
} }
struct remote *pushremote_get(const char *name) struct remote *pushremote_get(const char *name)
{ {
return remote_get_1(name, pushremote_for_branch); read_config(the_repository);
return remotes_pushremote_get(the_repository->remote_state, name);
} }
int remote_is_configured(struct remote *remote, int in_repo) int remote_is_configured(struct remote *remote, int in_repo)
@ -572,12 +679,14 @@ int remote_is_configured(struct remote *remote, int in_repo)
int for_each_remote(each_remote_fn fn, void *priv) int for_each_remote(each_remote_fn fn, void *priv)
{ {
int i, result = 0; int i, result = 0;
read_config(); read_config(the_repository);
for (i = 0; i < remotes_nr && !result; i++) { for (i = 0; i < the_repository->remote_state->remotes_nr && !result;
struct remote *r = remotes[i]; i++) {
if (!r) struct remote *remote =
the_repository->remote_state->remotes[i];
if (!remote)
continue; continue;
result = fn(r, priv); result = fn(remote, priv);
} }
return result; return result;
} }
@ -1642,7 +1751,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
} }
} }
static void set_merge(struct branch *ret) static void set_merge(struct remote_state *remote_state, struct branch *ret)
{ {
struct remote *remote; struct remote *remote;
char *ref; char *ref;
@ -1662,7 +1771,7 @@ static void set_merge(struct branch *ret)
return; return;
} }
remote = remote_get(ret->remote_name); remote = remotes_remote_get(remote_state, ret->remote_name);
CALLOC_ARRAY(ret->merge, ret->merge_nr); CALLOC_ARRAY(ret->merge, ret->merge_nr);
for (i = 0; i < ret->merge_nr; i++) { for (i = 0; i < ret->merge_nr; i++) {
@ -1683,12 +1792,13 @@ struct branch *branch_get(const char *name)
{ {
struct branch *ret; struct branch *ret;
read_config(); read_config(the_repository);
if (!name || !*name || !strcmp(name, "HEAD")) if (!name || !*name || !strcmp(name, "HEAD"))
ret = current_branch; ret = the_repository->remote_state->current_branch;
else else
ret = make_branch(name, strlen(name)); ret = make_branch(the_repository->remote_state, name,
set_merge(ret); strlen(name));
set_merge(the_repository->remote_state, ret);
return ret; return ret;
} }
@ -1759,11 +1869,14 @@ static const char *tracking_for_push_dest(struct remote *remote,
return ret; return ret;
} }
static const char *branch_get_push_1(struct branch *branch, struct strbuf *err) static const char *branch_get_push_1(struct remote_state *remote_state,
struct branch *branch, struct strbuf *err)
{ {
struct remote *remote; struct remote *remote;
remote = remote_get(pushremote_for_branch(branch, NULL)); remote = remotes_remote_get(
remote_state,
remotes_pushremote_for_branch(remote_state, branch, NULL));
if (!remote) if (!remote)
return error_buf(err, return error_buf(err,
_("branch '%s' has no remote for pushing"), _("branch '%s' has no remote for pushing"),
@ -1821,11 +1934,15 @@ static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
const char *branch_get_push(struct branch *branch, struct strbuf *err) const char *branch_get_push(struct branch *branch, struct strbuf *err)
{ {
read_config(the_repository);
die_on_missing_branch(the_repository, branch);
if (!branch) if (!branch)
return error_buf(err, _("HEAD does not point to a branch")); return error_buf(err, _("HEAD does not point to a branch"));
if (!branch->push_tracking_ref) if (!branch->push_tracking_ref)
branch->push_tracking_ref = branch_get_push_1(branch, err); branch->push_tracking_ref = branch_get_push_1(
the_repository->remote_state, branch, err);
return branch->push_tracking_ref; return branch->push_tracking_ref;
} }
@ -2585,3 +2702,29 @@ void apply_push_cas(struct push_cas_option *cas,
check_if_includes_upstream(ref); check_if_includes_upstream(ref);
} }
} }
struct remote_state *remote_state_new(void)
{
struct remote_state *r = xmalloc(sizeof(*r));
memset(r, 0, sizeof(*r));
hashmap_init(&r->remotes_hash, remotes_hash_cmp, NULL, 0);
hashmap_init(&r->branches_hash, branches_hash_cmp, NULL, 0);
return r;
}
void remote_state_clear(struct remote_state *remote_state)
{
int i;
for (i = 0; i < remote_state->remotes_nr; i++) {
remote_clear(remote_state->remotes[i]);
}
FREE_AND_NULL(remote_state->remotes);
remote_state->remotes_alloc = 0;
remote_state->remotes_nr = 0;
hashmap_clear_and_free(&remote_state->remotes_hash, struct remote, ent);
hashmap_clear_and_free(&remote_state->branches_hash, struct remote, ent);
}

35
remote.h
View File

@ -23,6 +23,40 @@ enum {
REMOTE_BRANCHES REMOTE_BRANCHES
}; };
struct rewrite {
const char *base;
size_t baselen;
struct counted_string *instead_of;
int instead_of_nr;
int instead_of_alloc;
};
struct rewrites {
struct rewrite **rewrite;
int rewrite_alloc;
int rewrite_nr;
};
struct remote_state {
struct remote **remotes;
int remotes_alloc;
int remotes_nr;
struct hashmap remotes_hash;
struct hashmap branches_hash;
struct branch *current_branch;
const char *pushremote_name;
struct rewrites rewrites;
struct rewrites rewrites_push;
int initialized;
};
void remote_state_clear(struct remote_state *remote_state);
struct remote_state *remote_state_new(void);
struct remote { struct remote {
struct hashmap_entry ent; struct hashmap_entry ent;
@ -256,6 +290,7 @@ int remote_find_tracking(struct remote *remote, struct refspec_item *refspec);
* branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD. * branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD.
*/ */
struct branch { struct branch {
struct hashmap_entry ent;
/* The short name of the branch. */ /* The short name of the branch. */
const char *name; const char *name;

8
repository.c
View File

@ -9,6 +9,7 @@
#include "config.h" #include "config.h"
#include "object.h" #include "object.h"
#include "lockfile.h" #include "lockfile.h"
#include "remote.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "sparse-index.h" #include "sparse-index.h"
#include "promisor-remote.h" #include "promisor-remote.h"
@ -24,6 +25,7 @@ void initialize_the_repository(void)
the_repo.index = &the_index; the_repo.index = &the_index;
the_repo.objects = raw_object_store_new(); the_repo.objects = raw_object_store_new();
the_repo.remote_state = remote_state_new();
the_repo.parsed_objects = parsed_object_pool_new(); the_repo.parsed_objects = parsed_object_pool_new();
repo_set_hash_algo(&the_repo, GIT_HASH_SHA1); repo_set_hash_algo(&the_repo, GIT_HASH_SHA1);
@ -164,6 +166,7 @@ int repo_init(struct repository *repo,
repo->objects = raw_object_store_new(); repo->objects = raw_object_store_new();
repo->parsed_objects = parsed_object_pool_new(); repo->parsed_objects = parsed_object_pool_new();
repo->remote_state = remote_state_new();
if (repo_init_gitdir(repo, gitdir)) if (repo_init_gitdir(repo, gitdir))
goto error; goto error;
@ -270,6 +273,11 @@ void repo_clear(struct repository *repo)
promisor_remote_clear(repo->promisor_remote_config); promisor_remote_clear(repo->promisor_remote_config);
FREE_AND_NULL(repo->promisor_remote_config); FREE_AND_NULL(repo->promisor_remote_config);
} }
if (repo->remote_state) {
remote_state_clear(repo->remote_state);
FREE_AND_NULL(repo->remote_state);
}
} }
int repo_read_index(struct repository *repo) int repo_read_index(struct repository *repo)

4
repository.h
View File

@ -11,6 +11,7 @@ struct pathspec;
struct raw_object_store; struct raw_object_store;
struct submodule_cache; struct submodule_cache;
struct promisor_remote_config; struct promisor_remote_config;
struct remote_state;
enum untracked_cache_setting { enum untracked_cache_setting {
UNTRACKED_CACHE_KEEP, UNTRACKED_CACHE_KEEP,
@ -127,6 +128,9 @@ struct repository {
*/ */
struct index_state *index; struct index_state *index;
/* Repository's remotes and associated structures. */
struct remote_state *remote_state;
/* Repository's current hash algorithm, as serialized on disk. */ /* Repository's current hash algorithm, as serialized on disk. */
const struct git_hash_algo *hash_algo; const struct git_hash_algo *hash_algo;

9
t/t5516-fetch-push.sh
View File

@ -541,6 +541,15 @@ do
done done
test_expect_success "push to remote with no explicit refspec and config remote.*.push = src:dest" '
mk_test testrepo heads/main &&
git checkout $the_first_commit &&
test_config remote.there.url testrepo &&
test_config remote.there.push refs/heads/main:refs/heads/main &&
git push there &&
check_push_result testrepo $the_commit heads/main
'
test_expect_success 'push with remote.pushdefault' ' test_expect_success 'push with remote.pushdefault' '
mk_test up_repo heads/main && mk_test up_repo heads/main &&
mk_test down_repo heads/main && mk_test down_repo heads/main &&