fix

Author: lunny

CHANGELOG-archived.md

@@ -2175,7 +2175,7 @@ This changelog (archived) contains changes for old releases.
   * Don't send notification on pending reviews (#8943)
   * Fix Notify Create Ref Error on tag creation (#8936)
   * Convert EOL to UNIX-style to render MD properly (#8925)
-  * Migrate temp_repo.go to use gitcmd.NewCommand  (#8918)
+  * Migrate temp_repo.go to use git.NewCommand  (#8918)
   * Fix issue with user.fullname (#8902)
   * Add Close() method to gogitRepository (#8901)
   * Enable punctuations ending mentions (#8889)

CHANGELOG.md

@@ -4170,7 +4170,7 @@ Key highlights of this release encompass significant changes categorized under `
   * Add number in queue status to monitor page (#18712)
   * Change git.cmd to RunWithContext (#18693)
   * Refactor i18n, use Locale to provide i18n/translation related functions (#18648)
-  * Delete old gitcmd.NewCommand() and use it as gitcmd.NewCommandContext() (#18552)
+  * Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)
   * Move organization related structs into sub package (#18518)
   * Warn at startup if the provided `SCRIPT_TYPE` is not on the PATH (#18467)
   * Use `CryptoRandomBytes` instead of `CryptoRandomString` (#18439)

modules/git/config.go

@@ -5,10 +5,8 @@ package git
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"regexp"
 	"runtime"
 	"strings"
@@ -119,17 +117,9 @@ func syncGitConfig(ctx context.Context) (err error) {
 	return err
 }
 
-func IsErrorExitCode(err error, code int) bool {
-	var exitError *exec.ExitError
-	if errors.As(err, &exitError) {
-		return exitError.ExitCode() == code
-	}
-	return false
-}
-
 func configSet(ctx context.Context, key, value string) error {
 	stdout, _, err := gitcmd.NewCommand("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
-	if err != nil && !IsErrorExitCode(err, 1) {
+	if err != nil && !gitcmd.IsErrorExitCode(err, 1) {
 		return fmt.Errorf("failed to get git config %s, err: %w", key, err)
 	}
 
@@ -152,7 +142,7 @@ func configSetNonExist(ctx context.Context, key, value string) error {
 		// already exist
 		return nil
 	}
-	if IsErrorExitCode(err, 1) {
+	if gitcmd.IsErrorExitCode(err, 1) {
 		// not exist, set new config
 		_, _, err = gitcmd.NewCommand("config", "--global").AddDynamicArguments(key, value).RunStdString(ctx, nil)
 		if err != nil {
@@ -170,7 +160,7 @@ func configAddNonExist(ctx context.Context, key, value string) error {
 		// already exist
 		return nil
 	}
-	if IsErrorExitCode(err, 1) {
+	if gitcmd.IsErrorExitCode(err, 1) {
 		// not exist, add new config
 		_, _, err = gitcmd.NewCommand("config", "--global", "--add").AddDynamicArguments(key, value).RunStdString(ctx, nil)
 		if err != nil {
@@ -191,7 +181,7 @@ func configUnsetAll(ctx context.Context, key, value string) error {
 		}
 		return nil
 	}
-	if IsErrorExitCode(err, 1) {
+	if gitcmd.IsErrorExitCode(err, 1) {
 		// not exist
 		return nil
 	}

modules/git/gitcmd/command.go

@@ -185,7 +185,7 @@ func (c *Command) AddConfig(key, value string) *Command {
 }
 
 // ToTrustedCmdArgs converts a list of strings (trusted as argument) to TrustedCmdArgs
-// In most cases, it shouldn't be used. Use cmd.NewCommand().AddXxx() function instead
+// In most cases, it shouldn't be used. Use NewCommand().AddXxx() function instead
 func ToTrustedCmdArgs(args []string) TrustedCmdArgs {
 	ret := make(TrustedCmdArgs, len(args))
 	for i, arg := range args {
@@ -389,6 +389,14 @@ func (r *runStdError) Stderr() string {
 	return r.stderr
 }
 
+func IsErrorExitCode(err error, code int) bool {
+	var exitError *exec.ExitError
+	if errors.As(err, &exitError) {
+		return exitError.ExitCode() == code
+	}
+	return false
+}
+
 // RunStdString runs the command with options and returns stdout/stderr as string. and store stderr to returned error (err combined with stderr).
 func (c *Command) RunStdString(ctx context.Context, opts *RunOpts) (stdout, stderr string, runErr RunStdError) {
 	stdoutBytes, stderrBytes, err := c.runStdBytes(ctx, opts)

modules/git/grep.go

@@ -136,11 +136,11 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
 		},
 	})
 	// git grep exits by cancel (killed), usually it is caused by the limit of results
-	if IsErrorExitCode(err, -1) && stderr.Len() == 0 {
+	if gitcmd.IsErrorExitCode(err, -1) && stderr.Len() == 0 {
 		return results, nil
 	}
 	// git grep exits with 1 if no results are found
-	if IsErrorExitCode(err, 1) && stderr.Len() == 0 {
+	if gitcmd.IsErrorExitCode(err, 1) && stderr.Len() == 0 {
 		return nil, nil
 	}
 	if err != nil && !errors.Is(err, context.Canceled) {