From ce272f2e53062ca94e860e1565aa5e8ed9c670c2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Jan 2022 14:48:18 +0800 Subject: [PATCH] Fix broken when no commits and default branch is not master (#18424) * Fix broken when no commits and default branch is not master * Fix IsEmpty check * Improve codes --- modules/git/repo.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/git/repo.go b/modules/git/repo.go index 43f329f448..53a8666d8b 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -75,16 +75,16 @@ func InitRepository(repoPath string, bare bool) error { // IsEmpty Check if repository is empty. func (repo *Repository) IsEmpty() (bool, error) { - var errbuf strings.Builder - if err := NewCommand("log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { - if strings.Contains(errbuf.String(), "fatal: bad default revision 'HEAD'") || - strings.Contains(errbuf.String(), "fatal: your current branch 'master' does not have any commits yet") { - return true, nil - } + var errbuf, output strings.Builder + if err := NewCommand("rev-list", "--all", "--count", "--max-count=1").RunInDirPipeline(repo.Path, &output, &errbuf); err != nil { 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