domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Use git.HOME_PATH for Git HOME directory (#20114) (#20293)

Browse source 
Before, in #19732, the old home directory is not correct.
This PR introduces a new config option for git home: git.HOME_PATH,
which is default to %(APP_DATA_PATH)/home

And pass env GNUPGHOME to git command, force Gitea to use a stable GNUPGHOME directory
This commit is contained in:
wxiaoguang 2022-07-08 21:44:36 +08:00 • committed by GitHub
parent 039a60225a
commit 5e5ff77ed7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 64 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/setting/git.go
View file

@ -5,6 +5,7 @@
package setting
import (
"path/filepath"
"time"
"code.gitea.io/gitea/modules/log"
@ -13,6 +14,7 @@ import (
// Git settings
var Git = struct {
Path string
HomePath string
DisableDiffHighlight bool
MaxGitDiffLines int
MaxGitDiffLineCharacters int
@ -67,7 +69,16 @@ var Git = struct {
}
func newGit() {
if err := Cfg.Section("git").MapTo(&Git); err != nil {
sec := Cfg.Section("git")
if err := sec.MapTo(&Git); err != nil {
log.Fatal("Failed to map Git settings: %v", err)
}
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)
}
}