Fix linkt error

Author: lunny

modules/git/batch.go

@@ -49,7 +49,7 @@ func newBatchCatFileWithCheck(ctx context.Context, repoPath string) (*batchCatFi
 	}
 
 	var batch batchCatFile
-	batch.Writer, batch.Reader, batch.cancel = catFileBatch(ctx, repoPath, "--batch")
+	batch.Writer, batch.Reader, batch.cancel = catFileBatch(ctx, repoPath, true)
 
 	var check batchCatFile
 	check.Writer, check.Reader, check.cancel = catFileBatchCheck(ctx, repoPath)
@@ -102,7 +102,7 @@ func newBatchCommandCatFile(ctx context.Context, repoPath string) (*batchCommand
 	}
 
 	var batch batchCatFile
-	batch.Writer, batch.Reader, batch.cancel = catFileBatch(ctx, repoPath, "--batch-command")
+	batch.Writer, batch.Reader, batch.cancel = catFileBatch(ctx, repoPath, false)
 
 	return &batchCommandCatFile{
 		batch: &batch,

modules/git/batch_reader.go

@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"strings"
 
-	"code.gitea.io/gitea/modules/git/internal"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/util"
 
 	"github.com/djherbis/buffer"
 	"github.com/djherbis/nio/v3"
@@ -89,7 +89,8 @@ func catFileBatchCheck(ctx context.Context, repoPath string) (WriteCloserError,
 
 // catFileBatch opens git cat-file --batch in the provided repo and returns a stdin pipe, a stdout reader and cancel function
 // batchArg is the argument to pass to cat-file --batch, e.g. "--batch" or "--batch-command"
-func catFileBatch(ctx context.Context, repoPath, batchArg string) (WriteCloserError, *bufio.Reader, func()) {
+// If batchOrBatchCommnd is false, it will use "--batch-command" instead of "--batch".
+func catFileBatch(ctx context.Context, repoPath string, batchOrBatchCommnd bool) (WriteCloserError, *bufio.Reader, func()) {
 	// We often want to feed the commits in order into cat-file --batch, followed by their trees and sub trees as necessary.
 	// so let's create a batch stdin and stdout
 	batchStdinReader, batchStdinWriter := io.Pipe()
@@ -109,10 +110,15 @@ func catFileBatch(ctx context.Context, repoPath, batchArg string) (WriteCloserEr
 		cancel()
 	}()
 
+	const (
+		batchCmdArg     = "--batch"
+		batchCommandArg = "--batch-command"
+	)
+
 	go func() {
 		stderr := strings.Builder{}
 		err := NewCommand("cat-file").
-			AddArguments(internal.CmdArg(batchArg)).
+			AddArguments(toTrustCmdArg(util.Iif(batchOrBatchCommnd, batchCmdArg, batchCommandArg))).
 			Run(ctx, &RunOpts{
 				Dir:    repoPath,
 				Stdin:  batchStdinReader,

modules/git/command.go

@@ -196,6 +196,12 @@ func (c *Command) AddDashesAndList(list ...string) *Command {
 	return c
 }
 
+// toTrustCmdArg converts a string (trusted as argument) to CmdArg
+// In most cases, it shouldn't be used. Use AddXxx function instead
+func toTrustCmdArg(arg string) internal.CmdArg {
+	return internal.CmdArg(arg)
+}
+
 // ToTrustedCmdArgs converts a list of strings (trusted as argument) to TrustedCmdArgs
 // In most cases, it shouldn't be used. Use NewCommand().AddXxx() function instead
 func ToTrustedCmdArgs(args []string) TrustedCmdArgs {