From 4c21b82e181aaf7bed931331fb9e24bc740324f7 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 2 Oct 2023 23:30:04 +0800 Subject: [PATCH] Fix git 2.11 error when checking IsEmpty (#27393) (#27396) Backport #27393 by @wxiaoguang Fix #27389 --------- Co-authored-by: wxiaoguang (cherry picked from commit acedf0f702d7037c89b87384bc399141d5d0af98) --- modules/git/repo.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/git/repo.go b/modules/git/repo.go index 5681d39c3b..32f0e7007e 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -86,7 +86,8 @@ func (repo *Repository) IsEmpty() (bool, error) { Stdout: &output, Stderr: &errbuf, }); err != nil { - if err.Error() == "exit status 1" && errbuf.String() == "" { + if (err.Error() == "exit status 1" && strings.TrimSpace(errbuf.String()) == "") || err.Error() == "exit status 129" { + // git 2.11 exits with 129 if the repo is empty return true, nil } return true, fmt.Errorf("check empty: %w - %s", err, errbuf.String())