TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 08:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* Fix IsEmpty check

* Improve codes

* Add timeout
This commit is contained in:
Lunny Xiao
2022-01-28 10:51:16 +08:00
committed by GitHub
parent 668718c67e
commit 401e5c8174
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/git/repo.go
View File

@@ -79,16 +79,22 @@ func InitRepository(ctx context.Context, 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 := NewCommandContext(repo.Ctx, "log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { if err := NewCommandContext(repo.Ctx, "rev-list", "--all", "--count", "--max-count=1").
if strings.Contains(errbuf.String(), "fatal: bad default revision 'HEAD'") || RunWithContext(&RunContext{
strings.Contains(errbuf.String(), "fatal: your current branch 'master' does not have any commits yet") { Timeout: -1,
return true, nil Dir: repo.Path,
} 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