mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Move some functions to gitrepo package (#35543)
Refactor Git command functions to use WithXXX methods instead of exposing RunOpts. This change simplifies reuse across gitrepo and improves consistency, encapsulation, and maintainability of command options. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -77,13 +77,12 @@ func NewBatchChecker(repo *git.Repository, treeish string, attributes []string) | ||||
| 			_ = lw.Close() | ||||
| 		}() | ||||
| 		stdErr := new(bytes.Buffer) | ||||
| 		err := cmd.Run(ctx, &gitcmd.RunOpts{ | ||||
| 			Env:    envs, | ||||
| 			Dir:    repo.Path, | ||||
| 			Stdin:  stdinReader, | ||||
| 			Stdout: lw, | ||||
| 			Stderr: stdErr, | ||||
| 		}) | ||||
| 		err := cmd.WithEnv(envs). | ||||
| 			WithDir(repo.Path). | ||||
| 			WithStdin(stdinReader). | ||||
| 			WithStdout(lw). | ||||
| 			WithStderr(stdErr). | ||||
| 			Run(ctx) | ||||
|  | ||||
| 		if err != nil && !git.IsErrCanceledOrKilled(err) { | ||||
| 			log.Error("Attribute checker for commit %s exits with error: %v", treeish, err) | ||||
|   | ||||
| @@ -71,12 +71,11 @@ func CheckAttributes(ctx context.Context, gitRepo *git.Repository, treeish strin | ||||
| 	stdOut := new(bytes.Buffer) | ||||
| 	stdErr := new(bytes.Buffer) | ||||
|  | ||||
| 	if err := cmd.Run(ctx, &gitcmd.RunOpts{ | ||||
| 		Env:    append(os.Environ(), envs...), | ||||
| 		Dir:    gitRepo.Path, | ||||
| 		Stdout: stdOut, | ||||
| 		Stderr: stdErr, | ||||
| 	}); err != nil { | ||||
| 	if err := cmd.WithEnv(append(os.Environ(), envs...)). | ||||
| 		WithDir(gitRepo.Path). | ||||
| 		WithStdout(stdOut). | ||||
| 		WithStderr(stdErr). | ||||
| 		Run(ctx); err != nil { | ||||
| 		return nil, fmt.Errorf("failed to run check-attr: %w\n%s\n%s", err, stdOut.String(), stdErr.String()) | ||||
| 	} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user