Skip to content

Commit

Permalink
Fix broken when no commits and default branch is not master (#18424)
Browse files Browse the repository at this point in the history
* Fix broken when no commits and default branch is not master

* Fix IsEmpty check

* Improve codes
  • Loading branch information
lunny authored Jan 28, 2022
1 parent 9d9ad1b commit ce272f2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions modules/git/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce272f2

Please sign in to comment.