From abee9271a22b5909e2e4ba141bab8ab55e7940fb Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Jan 2022 09:37:48 +0800 Subject: [PATCH 1/4] Fix broken when no commits and default branch is not master --- modules/git/repo.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/git/repo.go b/modules/git/repo.go index 663e13dc18fff..867ebca0aa999 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -81,8 +81,12 @@ func InitRepository(ctx context.Context, repoPath string, bare bool) error { func (repo *Repository) IsEmpty() (bool, error) { var errbuf strings.Builder if err := NewCommandContext(repo.Ctx, "log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { + defaultBranch, err := repo.GetDefaultBranch() + if err != nil { + return false, err + } 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") { + strings.Contains(errbuf.String(), fmt.Sprintf("fatal: your current branch '%s' does not have any commits yet", defaultBranch)) { return true, nil } return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String()) From 9239ffa3a4069583da42d209232d1c014042f0e8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Jan 2022 20:52:58 +0800 Subject: [PATCH 2/4] Fix IsEmpty check --- modules/git/repo.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/modules/git/repo.go b/modules/git/repo.go index 867ebca0aa999..086cb6427ead0 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -80,19 +80,12 @@ func InitRepository(ctx context.Context, repoPath string, bare bool) error { // IsEmpty Check if repository is empty. func (repo *Repository) IsEmpty() (bool, error) { var errbuf strings.Builder - if err := NewCommandContext(repo.Ctx, "log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { - defaultBranch, err := repo.GetDefaultBranch() - if err != nil { - return false, err - } - if strings.Contains(errbuf.String(), "fatal: bad default revision 'HEAD'") || - strings.Contains(errbuf.String(), fmt.Sprintf("fatal: your current branch '%s' does not have any commits yet", defaultBranch)) { - return true, nil - } + if err := NewCommandContext(repo.Ctx, "rev-list", "--all", "--count", "--max-count=1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String()) } - return false, nil + c, _ := strconv.Atoi(errbuf.String()) + return c == 0, nil } // CloneRepoOptions options when clone a repository From 91e8d6f879fdc9ee6b80bd070b7051b6842e24e3 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Jan 2022 10:06:06 +0800 Subject: [PATCH 3/4] Improve codes --- modules/git/repo.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/git/repo.go b/modules/git/repo.go index 086cb6427ead0..ed9c08108a12a 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -79,12 +79,20 @@ func InitRepository(ctx context.Context, repoPath string, bare bool) error { // IsEmpty Check if repository is empty. func (repo *Repository) IsEmpty() (bool, error) { - var errbuf strings.Builder - if err := NewCommandContext(repo.Ctx, "rev-list", "--all", "--count", "--max-count=1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil { + var errbuf, output strings.Builder + if err := NewCommandContext(repo.Ctx, "rev-list", "--all", "--count", "--max-count=1"). + RunWithContext(&RunContext{ + Dir: repo.Path, + Stdout: &output, + Stderr: &errbuf, + }); err != nil { return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String()) } - c, _ := strconv.Atoi(errbuf.String()) + 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 } From bdcde28f3520af9007f3b541de2648a2827aec0a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Jan 2022 10:08:13 +0800 Subject: [PATCH 4/4] Add timeout --- modules/git/repo.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/git/repo.go b/modules/git/repo.go index ed9c08108a12a..881a76c87f6ed 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -82,9 +82,10 @@ func (repo *Repository) IsEmpty() (bool, error) { var errbuf, output strings.Builder if err := NewCommandContext(repo.Ctx, "rev-list", "--all", "--count", "--max-count=1"). RunWithContext(&RunContext{ - Dir: repo.Path, - Stdout: &output, - Stderr: &errbuf, + Timeout: -1, + Dir: repo.Path, + Stdout: &output, + Stderr: &errbuf, }); err != nil { return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String()) }