mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: respect core.defaultBranchName

Browse Source 
When guessing the default branch name of a remote, and there are no refs
to guess from, we want to go with the preference specified by the user
for the fall-back.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2020-06-10 21:19:23 +00:00
committed by Junio C Hamano
parent c345805a52
commit 1859f4ee3e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
remote.c
View File

@ -256,7 +256,7 @@ static void read_remotes_file(struct remote *remote)
static void read_branches_file(struct remote *remote) static void read_branches_file(struct remote *remote)
{ {
char *frag; char *frag, *default_branch_name = NULL;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r"); FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
@ -276,7 +276,7 @@ static void read_branches_file(struct remote *remote)
/* /*
* The branches file would have URL and optionally * The branches file would have URL and optionally
* #branch specified. The "master" (or specified) branch is * #branch specified. The default (or specified) branch is
* fetched and stored in the local branch matching the * fetched and stored in the local branch matching the
* remote name. * remote name.
*/ */
@ -284,7 +284,7 @@ static void read_branches_file(struct remote *remote)
if (frag) if (frag)
*(frag++) = '\0'; *(frag++) = '\0';
else else
frag = "master"; frag = default_branch_name = git_default_branch_name(1);
add_url_alias(remote, strbuf_detach(&buf, NULL)); add_url_alias(remote, strbuf_detach(&buf, NULL));
strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s", strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s",
@ -299,6 +299,7 @@ static void read_branches_file(struct remote *remote)
strbuf_addf(&buf, "HEAD:refs/heads/%s", frag); strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
refspec_append(&remote->push, buf.buf); refspec_append(&remote->push, buf.buf);
remote->fetch_tags = 1; /* always auto-follow */ remote->fetch_tags = 1; /* always auto-follow */
free(default_branch_name);
strbuf_release(&buf); strbuf_release(&buf);
} }
@ -2099,7 +2100,10 @@ struct ref *guess_remote_head(const struct ref *head,
/* If refs/heads/master could be right, it is. */ /* If refs/heads/master could be right, it is. */
if (!all) { if (!all) {
r = find_ref_by_name(refs, "refs/heads/master"); char *name = git_default_branch_name(0);
r = find_ref_by_name(refs, name);
free(name);
if (r && oideq(&r->old_oid, &head->old_oid)) if (r && oideq(&r->old_oid, &head->old_oid))
return copy_ref(r); return copy_ref(r);
} }