Skip to content

rename default branch from 'master' to 'main' in refs and test scripts #1961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

rename default branch from 'master' to 'main' in refs and test scripts #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion refs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ char *repo_default_branch_name(struct repository *r, int quiet)
die(_("could not retrieve `%s`"), config_display_key);

if (!ret) {
ret = xstrdup("master");
ret = xstrdup("main");
if (!quiet)
advise_if_enabled(ADVICE_DEFAULT_BRANCH_NAME,
_(default_branch_name_advice), ret);
Expand Down
2 changes: 1 addition & 1 deletion remote.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,7 +2379,7 @@ struct ref *guess_remote_head(const struct ref *head,
return copy_ref(r);

/* Fall back to the hard-coded historical default */
r = find_ref_by_name(refs, "refs/heads/master");
r = find_ref_by_name(refs, "refs/heads/main");
if (r && oideq(&r->old_oid, &head->old_oid))
return copy_ref(r);
}
Expand Down
2 changes: 1 addition & 1 deletion t/test-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ fi

# Explicitly set the default branch name for testing, to avoid the
# transitory "git init" warning under --verbose.
: ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=master}
: ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=main}
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

################################################################
Expand Down
Loading