Use "main" as default branch name (#19354) * Use "main" as default branch name * fix test code

Changes

5 changed files (+5/-3)

• custom/conf/app.example.ini
  • @@ -879,7 +879,7 @@ PATH =
    ;DISABLE_STARS = false ;; ;; The default branch name of new repositories - ;DEFAULT_BRANCH = master + ;DEFAULT_BRANCH = main ;; ;; Allow adoption of unadopted repositories ;ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES = false
• docs/content/doc/advanced/config-cheat-sheet.en-us.md
  • @@ -75,7 +75,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
    - `PREFIX_ARCHIVE_FILES`: **true**: Prefix archive files by placing them in a directory named after the repository. - `DISABLE_MIGRATIONS`: **false**: Disable migrating feature. - `DISABLE_STARS`: **false**: Disable stars feature. - - `DEFAULT_BRANCH`: **master**: Default branch name of all repositories. + - `DEFAULT_BRANCH`: **main**: Default branch name of all repositories. - `ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to adopt unadopted repositories - `ALLOW_DELETION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to delete unadopted repositories
• integrations/integration_test.go
  • @@ -165,6 +165,7 @@ func initIntegrationTest() {
    setting.SetCustomPathAndConf("", "", "") setting.LoadForTest() + setting.Repository.DefaultBranch = "master" // many test code still assume that default branch is called "master" _ = util.RemoveAll(models.LocalCopyPath()) git.CheckLFSVersion() setting.InitDBConfig()
• models/unittest/testdb.go
  • @@ -69,6 +69,7 @@ func MainTest(m *testing.M, pathToGiteaRoot string, fixtureFiles ...string) {
    setting.SSH.Port = 3000 setting.SSH.Domain = "try.gitea.io" setting.Database.UseSQLite3 = true + setting.Repository.DefaultBranch = "master" // many test code still assume that default branch is called "master" repoRootPath, err := os.MkdirTemp(os.TempDir(), "repos") if err != nil { fatalTestError("TempDir: %v\n", err)
• modules/setting/repository.go
  • @@ -154,7 +154,7 @@ var (
    PrefixArchiveFiles: true, DisableMigrations: false, DisableStars: false, - DefaultBranch: "master", + DefaultBranch: "main", // Repository editor settings Editor: struct {