Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken when no commits and default branch is not master (#18423) 

* Fix broken when no commits and default branch is not master

* Fix IsEmpty check

* Improve codes
This commit is contained in:
Lunny Xiao 2022-01-28 14:48:36 +08:00 committed by GitHub
parent 781ad8a79e
commit 2f22337125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/git/repo.go
View File

@ -79,16 +79,21 @@ func InitRepository(repoPath string, bare bool) error {
// IsEmpty Check if repository is empty. // IsEmpty Check if repository is empty.
func (repo *Repository) IsEmpty() (bool, error) { func (repo *Repository) IsEmpty() (bool, error) {
var errbuf strings.Builder var errbuf, output strings.Builder
if err := NewCommand("log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { if err := NewCommandContext(repo.Ctx, "rev-list", "--all", "--count", "--max-count=1").RunWithContext(&RunContext{
if strings.Contains(errbuf.String(), "fatal: bad default revision 'HEAD'") || Timeout: -1,
strings.Contains(errbuf.String(), "fatal: your current branch 'master' does not have any commits yet") { Dir: repo.Path,
return true, nil Stdout: &output,
} Stderr: &errbuf,
}); err != nil {
return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String()) return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String())
} }
return false, nil c, err := strconv.Atoi(strings.TrimSpace(output.String()))
if err != nil {
return true, fmt.Errorf("check empty: convert %s to count failed: %v", output.String(), err)
}
return c == 0, nil
} }
// CloneRepoOptions options when clone a repository // CloneRepoOptions options when clone a repository