diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2024-03-06 14:26:32 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-06 14:26:32 +0800 |
commit | 5cddab4f74bbb307ddf13e458c7ac22f93b9283a (patch) | |
tree | 2eee924ffdbc2e1bedb6b63020e7b7fdd86417c3 /modules | |
parent | da15d6127c8d430dfc069f9815ce783dd9ca35f7 (diff) | |
download | gitea-5cddab4f74bbb307ddf13e458c7ac22f93b9283a.tar.gz gitea-5cddab4f74bbb307ddf13e458c7ac22f93b9283a.zip |
Make wiki default branch name changable (#29603)
Fix #29000
Fix #28685
Fix #18568
Related: #27497
And by the way fix #24036, add a Cancel button there (one line)
Diffstat (limited to 'modules')
-rw-r--r-- | modules/git/repo_base_gogit.go | 4 | ||||
-rw-r--r-- | modules/git/repo_base_nogogit.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go index 3ca5eb36c6..0cd07dcdc8 100644 --- a/modules/git/repo_base_gogit.go +++ b/modules/git/repo_base_gogit.go @@ -8,11 +8,11 @@ package git import ( "context" - "errors" "path/filepath" gitealog "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/osfs" @@ -52,7 +52,7 @@ func OpenRepository(ctx context.Context, repoPath string) (*Repository, error) { if err != nil { return nil, err } else if !isDir(repoPath) { - return nil, errors.New("no such file or directory") + return nil, util.NewNotExistErrorf("no such file or directory") } fs := osfs.New(repoPath) diff --git a/modules/git/repo_base_nogogit.go b/modules/git/repo_base_nogogit.go index 86b6a93567..7f6512200b 100644 --- a/modules/git/repo_base_nogogit.go +++ b/modules/git/repo_base_nogogit.go @@ -9,10 +9,10 @@ package git import ( "bufio" "context" - "errors" "path/filepath" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) func init() { @@ -54,7 +54,7 @@ func OpenRepository(ctx context.Context, repoPath string) (*Repository, error) { if err != nil { return nil, err } else if !isDir(repoPath) { - return nil, errors.New("no such file or directory") + return nil, util.NewNotExistErrorf("no such file or directory") } // Now because of some insanity with git cat-file not immediately failing if not run in a valid git directory we need to run git rev-parse first! |