Fix git 2.11 error when checking IsEmpty (again) (#27399)

wxiaoguang · web-flow · commit dfa4e5857fe9 · 2023-10-02T15:59:39.000Z
Follow #27393 Sorry that I made a mistake in #27393. The `errbuf` is not empty when the err is `exit status 129`.
diff --git a/modules/git/repo.go b/modules/git/repo.go
@@ -86,7 +86,7 @@ func (repo *Repository) IsEmpty() (bool, error) {
 			Stdout: &output,
 			Stderr: &errbuf,
 		}); err != nil {
-		if (err.Error() == "exit status 1" || err.Error() == "exit status 129") && strings.TrimSpace(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
 		}

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (repo *Repository) IsEmpty() (bool, error) {`
`86`	`86`	`Stdout: &output,`
`87`	`87`	`Stderr: &errbuf,`
`88`	`88`	`}); err != nil {`
`89`		`- if (err.Error() == "exit status 1" \|\| err.Error() == "exit status 129") && strings.TrimSpace(errbuf.String()) == "" {`
	`89`	`+ if (err.Error() == "exit status 1" && strings.TrimSpace(errbuf.String()) == "") \|\| err.Error() == "exit status 129" {`
`90`	`90`	`// git 2.11 exits with 129 if the repo is empty`
`91`	`91`	`return true, nil`
`92`	`92`	`}`