mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-20 17:19:36 +00:00
bircniandsilverwind
ba4f8fa246
Adds a repository setting for the default squash merge commit message body with GitHub's options `PR_BODY`, `COMMIT_MESSAGES` and `BLANK`, also settable via `squash_merge_commit_message` in the API. The commit title stays the pull request title. 1. Breaking: API squash merges without `merge_message_field` now get the same default message as the web merge box instead of a title-only commit, which affects clients sending only `Do` like Renovate. An empty value keeps title-only. 2. Breaking: `[repository.pull-request] DEFAULT_SQUASH_MERGE_MESSAGE` replaces `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`, which still works as a deprecated fallback. Repositories store the default when created or next saved. 3. Deprecated app.ini keys now migrate through one table instead of per-loader fallbacks, which also fixes the ignored `[mailer] CERT_FILE` and `KEY_FILE` fallbacks. Deprecation warnings no longer claim a removal version. <img width="1891" height="571" alt="grafik" src="https://github.com/user-attachments/assets/0fdcde13-1f11-4156-b598-d80eb0d04cbe" /> --------- Co-authored-by: silverwind <me@silverwind.io>
107 lines
2.9 KiB
Go
107 lines
2.9 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
"time"
|
|
|
|
"gitea.dev/modules/log"
|
|
)
|
|
|
|
// Git settings
|
|
var Git = struct {
|
|
Path string
|
|
HomePath string
|
|
DisableDiffHighlight bool
|
|
|
|
MaxGitDiffLines int
|
|
MaxGitDiffLineCharacters int
|
|
MaxGitDiffFiles int
|
|
CommitsRangeSize int // CommitsRangeSize the default commits range size
|
|
BranchesRangeSize int // BranchesRangeSize the default branches range size
|
|
VerbosePush bool
|
|
VerbosePushDelay time.Duration
|
|
GCArgs []string `ini:"GC_ARGS" delim:" "`
|
|
EnableAutoGitWireProtocol bool
|
|
PullRequestPushMessage bool
|
|
DisableCoreProtectNTFS bool
|
|
DisablePartialClone bool
|
|
DiffRenameSimilarityThreshold string
|
|
Timeout struct {
|
|
Migrate int
|
|
Mirror int
|
|
GC int `ini:"GC"`
|
|
} `ini:"git.timeout"`
|
|
}{
|
|
DisableDiffHighlight: false,
|
|
MaxGitDiffLines: 1000,
|
|
MaxGitDiffLineCharacters: 5000,
|
|
MaxGitDiffFiles: 100,
|
|
CommitsRangeSize: 50,
|
|
BranchesRangeSize: 20,
|
|
VerbosePush: true,
|
|
VerbosePushDelay: 5 * time.Second,
|
|
GCArgs: []string{},
|
|
EnableAutoGitWireProtocol: true,
|
|
PullRequestPushMessage: true,
|
|
DisablePartialClone: false,
|
|
DiffRenameSimilarityThreshold: "50%",
|
|
Timeout: struct {
|
|
Migrate int
|
|
Mirror int
|
|
GC int `ini:"GC"`
|
|
}{
|
|
Migrate: 600,
|
|
Mirror: 300,
|
|
GC: 60,
|
|
},
|
|
}
|
|
|
|
type GitConfigType struct {
|
|
Options map[string]string // git config key is case-insensitive, always use lower-case
|
|
}
|
|
|
|
func (c *GitConfigType) SetOption(key, val string) {
|
|
c.Options[strings.ToLower(key)] = val
|
|
}
|
|
|
|
func (c *GitConfigType) GetOption(key string) string {
|
|
return c.Options[strings.ToLower(key)]
|
|
}
|
|
|
|
var GitConfig = GitConfigType{
|
|
Options: make(map[string]string),
|
|
}
|
|
|
|
func loadGitFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("git")
|
|
if err := sec.MapTo(&Git); err != nil {
|
|
log.Fatal("Failed to map Git settings: %v", err)
|
|
}
|
|
|
|
secGitConfig := rootCfg.Section("git.config")
|
|
GitConfig.Options = make(map[string]string)
|
|
GitConfig.SetOption("diff.algorithm", "histogram")
|
|
GitConfig.SetOption("core.logAllRefUpdates", "true")
|
|
|
|
for _, key := range secGitConfig.Keys() {
|
|
GitConfig.SetOption(key.Name(), key.String())
|
|
}
|
|
|
|
Git.HomePath = sec.Key("HOME_PATH").MustString("home")
|
|
if !filepath.IsAbs(Git.HomePath) {
|
|
Git.HomePath = filepath.Join(AppDataPath, Git.HomePath)
|
|
} else {
|
|
Git.HomePath = filepath.Clean(Git.HomePath)
|
|
}
|
|
|
|
// validate for a integer percentage between 0% and 100%
|
|
if !regexp.MustCompile(`^([0-9]|[1-9][0-9]|100)%$`).MatchString(Git.DiffRenameSimilarityThreshold) {
|
|
log.Fatal("Invalid git.DIFF_RENAME_SIMILARITY_THRESHOLD: %s", Git.DiffRenameSimilarityThreshold)
|
|
}
|
|
}
|