Skip to content

Commit 124b072

Browse files
wxiaoguangwxiaoguang
authored
Remove git.Command.Run and git.Command.RunInDir* (#19280)
Follows #19266, #8553, Close #18553, now there are only three `Run..(&RunOpts{})` functions. * before: `stdout, err := RunInDir(path)` * now: `stdout, _, err := RunStdString(&git.RunOpts{Dir:path})`
1 parent 3a73645 commit 124b072

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+594
-672
lines changed

‎cmd/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func runHookPostReceive(c *cli.Context) error {
309309
defer cancel()
310310

311311
// First of all run update-server-info no matter what
312-
if _, err := git.NewCommand(ctx, "update-server-info").Run(); err != nil {
312+
if _, _, err := git.NewCommand(ctx, "update-server-info").RunStdString(nil); err != nil {
313313
return fmt.Errorf("Failed to call 'git update-server-info': %v", err)
314314
}
315315

‎integrations/api_repo_git_tags_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func TestAPIGitTags(t *testing.T) {
2828
token := getTokenForLoggedInUser(t, session)
2929

3030
// Set up git config for the tagger
31-
git.NewCommand(git.DefaultContext, "config", "user.name", user.Name).RunInDir(repo.RepoPath())
32-
git.NewCommand(git.DefaultContext, "config", "user.email", user.Email).RunInDir(repo.RepoPath())
31+
_ = git.NewCommand(git.DefaultContext, "config", "user.name", user.Name).Run(&git.RunOpts{Dir: repo.RepoPath()})
32+
_ = git.NewCommand(git.DefaultContext, "config", "user.email", user.Email).Run(&git.RunOpts{Dir: repo.RepoPath()})
3333

3434
gitRepo, _ := git.OpenRepository(git.DefaultContext, repo.RepoPath())
3535
defer gitRepo.Close()

‎integrations/git_helper_for_declarative_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
134134
// Init repository in dstPath
135135
assert.NoError(t, git.InitRepository(git.DefaultContext, dstPath, false))
136136
// forcibly set default branch to master
137-
_, err := git.NewCommand(git.DefaultContext, "symbolic-ref", "HEAD", git.BranchPrefix+"master").RunInDir(dstPath)
137+
_, _, err := git.NewCommand(git.DefaultContext, "symbolic-ref", "HEAD", git.BranchPrefix+"master").RunStdString(&git.RunOpts{Dir: dstPath})
138138
assert.NoError(t, err)
139139
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0o644))
140140
assert.NoError(t, git.AddChanges(dstPath, true))
@@ -153,49 +153,49 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
153153

154154
func doGitAddRemote(dstPath, remoteName string, u *url.URL) func(*testing.T) {
155155
return func(t *testing.T) {
156-
_, err := git.NewCommand(git.DefaultContext, "remote", "add", remoteName, u.String()).RunInDir(dstPath)
156+
_, _, err := git.NewCommand(git.DefaultContext, "remote", "add", remoteName, u.String()).RunStdString(&git.RunOpts{Dir: dstPath})
157157
assert.NoError(t, err)
158158
}
159159
}
160160

161161
func doGitPushTestRepository(dstPath string, args ...string) func(*testing.T) {
162162
return func(t *testing.T) {
163-
_, err := git.NewCommand(git.DefaultContext, append([]string{"push", "-u"}, args...)...).RunInDir(dstPath)
163+
_, _, err := git.NewCommand(git.DefaultContext, append([]string{"push", "-u"}, args...)...).RunStdString(&git.RunOpts{Dir: dstPath})
164164
assert.NoError(t, err)
165165
}
166166
}
167167

168168
func doGitPushTestRepositoryFail(dstPath string, args ...string) func(*testing.T) {
169169
return func(t *testing.T) {
170-
_, err := git.NewCommand(git.DefaultContext, append([]string{"push"}, args...)...).RunInDir(dstPath)
170+
_, _, err := git.NewCommand(git.DefaultContext, append([]string{"push"}, args...)...).RunStdString(&git.RunOpts{Dir: dstPath})
171171
assert.Error(t, err)
172172
}
173173
}
174174

175175
func doGitCreateBranch(dstPath, branch string) func(*testing.T) {
176176
return func(t *testing.T) {
177-
_, err := git.NewCommand(git.DefaultContext, "checkout", "-b", branch).RunInDir(dstPath)
177+
_, _, err := git.NewCommand(git.DefaultContext, "checkout", "-b", branch).RunStdString(&git.RunOpts{Dir: dstPath})
178178
assert.NoError(t, err)
179179
}
180180
}
181181

182182
func doGitCheckoutBranch(dstPath string, args ...string) func(*testing.T) {
183183
return func(t *testing.T) {
184-
_, err := git.NewCommandNoGlobals(append(append(git.AllowLFSFiltersArgs(), "checkout"), args...)...).RunInDir(dstPath)
184+
_, _, err := git.NewCommandNoGlobals(append(append(git.AllowLFSFiltersArgs(), "checkout"), args...)...).RunStdString(&git.RunOpts{Dir: dstPath})
185185
assert.NoError(t, err)
186186
}
187187
}
188188

189189
func doGitMerge(dstPath string, args ...string) func(*testing.T) {
190190
return func(t *testing.T) {
191-
_, err := git.NewCommand(git.DefaultContext, append([]string{"merge"}, args...)...).RunInDir(dstPath)
191+
_, _, err := git.NewCommand(git.DefaultContext, append([]string{"merge"}, args...)...).RunStdString(&git.RunOpts{Dir: dstPath})
192192
assert.NoError(t, err)
193193
}
194194
}
195195

196196
func doGitPull(dstPath string, args ...string) func(*testing.T) {
197197
return func(t *testing.T) {
198-
_, err := git.NewCommandNoGlobals(append(append(git.AllowLFSFiltersArgs(), "pull"), args...)...).RunInDir(dstPath)
198+
_, _, err := git.NewCommandNoGlobals(append(append(git.AllowLFSFiltersArgs(), "pull"), args...)...).RunStdString(&git.RunOpts{Dir: dstPath})
199199
assert.NoError(t, err)
200200
}
201201
}

‎integrations/git_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ func lfsCommitAndPushTest(t *testing.T, dstPath string) (littleLFS, bigLFS strin
160160
return
161161
}
162162
prefix := "lfs-data-file-"
163-
_, err := git.NewCommand(git.DefaultContext, "lfs").AddArguments("install").RunInDir(dstPath)
163+
err := git.NewCommand(git.DefaultContext, "lfs").AddArguments("install").Run(&git.RunOpts{Dir: dstPath})
164164
assert.NoError(t, err)
165-
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("track", prefix+"*").RunInDir(dstPath)
165+
_, _, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("track", prefix+"*").RunStdString(&git.RunOpts{Dir: dstPath})
166166
assert.NoError(t, err)
167167
err = git.AddChanges(dstPath, false, ".gitattributes")
168168
assert.NoError(t, err)
@@ -292,20 +292,20 @@ func lockTest(t *testing.T, repoPath string) {
292292
}
293293

294294
func lockFileTest(t *testing.T, filename, repoPath string) {
295-
_, err := git.NewCommand(git.DefaultContext, "lfs").AddArguments("locks").RunInDir(repoPath)
295+
_, _, err := git.NewCommand(git.DefaultContext, "lfs").AddArguments("locks").RunStdString(&git.RunOpts{Dir: repoPath})
296296
assert.NoError(t, err)
297-
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("lock", filename).RunInDir(repoPath)
297+
_, _, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("lock", filename).RunStdString(&git.RunOpts{Dir: repoPath})
298298
assert.NoError(t, err)
299-
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("locks").RunInDir(repoPath)
299+
_, _, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("locks").RunStdString(&git.RunOpts{Dir: repoPath})
300300
assert.NoError(t, err)
301-
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("unlock", filename).RunInDir(repoPath)
301+
_, _, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("unlock", filename).RunStdString(&git.RunOpts{Dir: repoPath})
302302
assert.NoError(t, err)
303303
}
304304

305305
func doCommitAndPush(t *testing.T, size int, repoPath, prefix string) string {
306306
name, err := generateCommitWithNewData(size, repoPath, "[email protected]", "User Two", prefix)
307307
assert.NoError(t, err)
308-
_, err = git.NewCommand(git.DefaultContext, "push", "origin", "master").RunInDir(repoPath) // Push
308+
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "master").RunStdString(&git.RunOpts{Dir: repoPath}) // Push
309309
assert.NoError(t, err)
310310
return name
311311
}
@@ -671,7 +671,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
671671
})
672672

673673
t.Run("Push", func(t *testing.T) {
674-
_, err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).RunInDir(dstPath)
674+
err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).Run(&git.RunOpts{Dir: dstPath})
675675
if !assert.NoError(t, err) {
676676
return
677677
}
@@ -692,7 +692,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
692692
assert.Contains(t, "Testing commit 1", prMsg.Body)
693693
assert.Equal(t, commit, prMsg.Head.Sha)
694694

695-
_, err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunInDir(dstPath)
695+
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunStdString(&git.RunOpts{Dir: dstPath})
696696
if !assert.NoError(t, err) {
697697
return
698698
}
@@ -745,7 +745,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
745745
})
746746

747747
t.Run("Push2", func(t *testing.T) {
748-
_, err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).RunInDir(dstPath)
748+
err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).Run(&git.RunOpts{Dir: dstPath})
749749
if !assert.NoError(t, err) {
750750
return
751751
}
@@ -757,7 +757,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
757757
assert.Equal(t, false, prMsg.HasMerged)
758758
assert.Equal(t, commit, prMsg.Head.Sha)
759759

760-
_, err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunInDir(dstPath)
760+
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunStdString(&git.RunOpts{Dir: dstPath})
761761
if !assert.NoError(t, err) {
762762
return
763763
}

‎integrations/pull_merge_test.go

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -269,25 +269,24 @@ func TestCantMergeUnrelated(t *testing.T) {
269269
}).(*repo_model.Repository)
270270
path := repo_model.RepoPath(user1.Name, repo1.Name)
271271

272-
_, err := git.NewCommand(git.DefaultContext, "read-tree", "--empty").RunInDir(path)
272+
err := git.NewCommand(git.DefaultContext, "read-tree", "--empty").Run(&git.RunOpts{Dir: path})
273273
assert.NoError(t, err)
274274

275275
stdin := bytes.NewBufferString("Unrelated File")
276276
var stdout strings.Builder
277-
err = git.NewCommand(git.DefaultContext, "hash-object", "-w", "--stdin").RunWithContext(&git.RunContext{
278-
Timeout: -1,
279-
Dir: path,
280-
Stdin: stdin,
281-
Stdout: &stdout,
277+
err = git.NewCommand(git.DefaultContext, "hash-object", "-w", "--stdin").Run(&git.RunOpts{
278+
Dir: path,
279+
Stdin: stdin,
280+
Stdout: &stdout,
282281
})
283282

284283
assert.NoError(t, err)
285284
sha := strings.TrimSpace(stdout.String())
286285

287-
_, err = git.NewCommand(git.DefaultContext, "update-index", "--add", "--replace", "--cacheinfo", "100644", sha, "somewher-over-the-rainbow").RunInDir(path)
286+
_, _, err = git.NewCommand(git.DefaultContext, "update-index", "--add", "--replace", "--cacheinfo", "100644", sha, "somewher-over-the-rainbow").RunStdString(&git.RunOpts{Dir: path})
288287
assert.NoError(t, err)
289288

290-
treeSha, err := git.NewCommand(git.DefaultContext, "write-tree").RunInDir(path)
289+
treeSha, _, err := git.NewCommand(git.DefaultContext, "write-tree").RunStdString(&git.RunOpts{Dir: path})
291290
assert.NoError(t, err)
292291
treeSha = strings.TrimSpace(treeSha)
293292

@@ -308,17 +307,16 @@ func TestCantMergeUnrelated(t *testing.T) {
308307

309308
stdout.Reset()
310309
err = git.NewCommand(git.DefaultContext, "commit-tree", treeSha).
311-
RunWithContext(&git.RunContext{
312-
Env: env,
313-
Timeout: -1,
314-
Dir: path,
315-
Stdin: messageBytes,
316-
Stdout: &stdout,
310+
Run(&git.RunOpts{
311+
Env: env,
312+
Dir: path,
313+
Stdin: messageBytes,
314+
Stdout: &stdout,
317315
})
318316
assert.NoError(t, err)
319317
commitSha := strings.TrimSpace(stdout.String())
320318

321-
_, err = git.NewCommand(git.DefaultContext, "branch", "unrelated", commitSha).RunInDir(path)
319+
_, _, err = git.NewCommand(git.DefaultContext, "branch", "unrelated", commitSha).RunStdString(&git.RunOpts{Dir: path})
322320
assert.NoError(t, err)
323321

324322
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")

‎integrations/repo_tag_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ func TestCreateNewTagProtected(t *testing.T) {
6666

6767
doGitClone(dstPath, u)(t)
6868

69-
_, err = git.NewCommand(git.DefaultContext, "tag", "v-2").RunInDir(dstPath)
69+
_, _, err = git.NewCommand(git.DefaultContext, "tag", "v-2").RunStdString(&git.RunOpts{Dir: dstPath})
7070
assert.NoError(t, err)
7171

72-
_, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunInDir(dstPath)
72+
_, _, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunStdString(&git.RunOpts{Dir: dstPath})
7373
assert.Error(t, err)
7474
assert.Contains(t, err.Error(), "Tag v-2 is protected")
7575
})

‎models/migrations/v128.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ func fixMergeBase(x *xorm.Engine) error {
8383

8484
if !pr.HasMerged {
8585
var err error
86-
pr.MergeBase, err = git.NewCommand(git.DefaultContext, "merge-base", "--", pr.BaseBranch, gitRefName).RunInDir(repoPath)
86+
pr.MergeBase, _, err = git.NewCommand(git.DefaultContext, "merge-base", "--", pr.BaseBranch, gitRefName).RunStdString(&git.RunOpts{Dir: repoPath})
8787
if err != nil {
8888
var err2 error
89-
pr.MergeBase, err2 = git.NewCommand(git.DefaultContext, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
89+
pr.MergeBase, _, err2 = git.NewCommand(git.DefaultContext, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunStdString(&git.RunOpts{Dir: repoPath})
9090
if err2 != nil {
9191
log.Error("Unable to get merge base for PR ID %d, Index %d in %s/%s. Error: %v & %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err, err2)
9292
continue
9393
}
9494
}
9595
} else {
96-
parentsString, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
96+
parentsString, _, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunStdString(&git.RunOpts{Dir: repoPath})
9797
if err != nil {
9898
log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
9999
continue
@@ -106,7 +106,7 @@ func fixMergeBase(x *xorm.Engine) error {
106106
args := append([]string{"merge-base", "--"}, parents[1:]...)
107107
args = append(args, gitRefName)
108108

109-
pr.MergeBase, err = git.NewCommand(git.DefaultContext, args...).RunInDir(repoPath)
109+
pr.MergeBase, _, err = git.NewCommand(git.DefaultContext, args...).RunStdString(&git.RunOpts{Dir: repoPath})
110110
if err != nil {
111111
log.Error("Unable to get merge base for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
112112
continue

‎models/migrations/v134.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func refixMergeBase(x *xorm.Engine) error {
8080

8181
gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index)
8282

83-
parentsString, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
83+
parentsString, _, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunStdString(&git.RunOpts{Dir: repoPath})
8484
if err != nil {
8585
log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
8686
continue
@@ -94,7 +94,7 @@ func refixMergeBase(x *xorm.Engine) error {
9494
args := append([]string{"merge-base", "--"}, parents[1:]...)
9595
args = append(args, gitRefName)
9696

97-
pr.MergeBase, err = git.NewCommand(git.DefaultContext, args...).RunInDir(repoPath)
97+
pr.MergeBase, _, err = git.NewCommand(git.DefaultContext, args...).RunStdString(&git.RunOpts{Dir: repoPath})
9898
if err != nil {
9999
log.Error("Unable to get merge base for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
100100
continue

‎modules/doctor/mergebase.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ func checkPRMergeBase(ctx context.Context, logger log.Logger, autofix bool) erro
4444

4545
if !pr.HasMerged {
4646
var err error
47-
pr.MergeBase, err = git.NewCommand(ctx, "merge-base", "--", pr.BaseBranch, pr.GetGitRefName()).RunInDir(repoPath)
47+
pr.MergeBase, _, err = git.NewCommand(ctx, "merge-base", "--", pr.BaseBranch, pr.GetGitRefName()).RunStdString(&git.RunOpts{Dir: repoPath})
4848
if err != nil {
4949
var err2 error
50-
pr.MergeBase, err2 = git.NewCommand(ctx, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
50+
pr.MergeBase, _, err2 = git.NewCommand(ctx, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunStdString(&git.RunOpts{Dir: repoPath})
5151
if err2 != nil {
5252
logger.Warn("Unable to get merge base for PR ID %d, #%d onto %s in %s/%s. Error: %v & %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err, err2)
5353
return nil
5454
}
5555
}
5656
} else {
57-
parentsString, err := git.NewCommand(ctx, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
57+
parentsString, _, err := git.NewCommand(ctx, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunStdString(&git.RunOpts{Dir: repoPath})
5858
if err != nil {
5959
logger.Warn("Unable to get parents for merged PR ID %d, #%d onto %s in %s/%s. Error: %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err)
6060
return nil
@@ -67,7 +67,7 @@ func checkPRMergeBase(ctx context.Context, logger log.Logger, autofix bool) erro
6767
args := append([]string{"merge-base", "--"}, parents[1:]...)
6868
args = append(args, pr.GetGitRefName())
6969

70-
pr.MergeBase, err = git.NewCommand(ctx, args...).RunInDir(repoPath)
70+
pr.MergeBase, _, err = git.NewCommand(ctx, args...).RunStdString(&git.RunOpts{Dir: repoPath})
7171
if err != nil {
7272
logger.Warn("Unable to get merge base for merged PR ID %d, #%d onto %s in %s/%s. Error: %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err)
7373
return nil

‎modules/doctor/misc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ func checkEnablePushOptions(ctx context.Context, logger log.Logger, autofix bool
9595
defer r.Close()
9696

9797
if autofix {
98-
_, err := git.NewCommand(ctx, "config", "receive.advertisePushOptions", "true").RunInDir(r.Path)
98+
_, _, err := git.NewCommand(ctx, "config", "receive.advertisePushOptions", "true").RunStdString(&git.RunOpts{Dir: r.Path})
9999
return err
100100
}
101101

102-
value, err := git.NewCommand(ctx, "config", "receive.advertisePushOptions").RunInDir(r.Path)
102+
value, _, err := git.NewCommand(ctx, "config", "receive.advertisePushOptions").RunStdString(&git.RunOpts{Dir: r.Path})
103103
if err != nil {
104104
return err
105105
}

‎modules/git/batch_reader.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func EnsureValidGitRepository(ctx context.Context, repoPath string) error {
3434
stderr := strings.Builder{}
3535
err := NewCommand(ctx, "rev-parse").
3636
SetDescription(fmt.Sprintf("%s rev-parse [repo_path: %s]", GitExecutable, repoPath)).
37-
RunWithContext(&RunContext{
38-
Timeout: -1,
39-
Dir: repoPath,
40-
Stderr: &stderr,
37+
Run(&RunOpts{
38+
Dir: repoPath,
39+
Stderr: &stderr,
4140
})
4241
if err != nil {
4342
return ConcatenateError(err, (&stderr).String())
@@ -65,12 +64,11 @@ func CatFileBatchCheck(ctx context.Context, repoPath string) (WriteCloserError,
6564
stderr := strings.Builder{}
6665
err := NewCommand(ctx, "cat-file", "--batch-check").
6766
SetDescription(fmt.Sprintf("%s cat-file --batch-check [repo_path: %s] (%s:%d)", GitExecutable, repoPath, filename, line)).
68-
RunWithContext(&RunContext{
69-
Timeout: -1,
70-
Dir: repoPath,
71-
Stdin: batchStdinReader,
72-
Stdout: batchStdoutWriter,
73-
Stderr: &stderr,
67+
Run(&RunOpts{
68+
Dir: repoPath,
69+
Stdin: batchStdinReader,
70+
Stdout: batchStdoutWriter,
71+
Stderr: &stderr,
7472
})
7573
if err != nil {
7674
_ = batchStdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
@@ -110,12 +108,11 @@ func CatFileBatch(ctx context.Context, repoPath string) (WriteCloserError, *bufi
110108
stderr := strings.Builder{}
111109
err := NewCommand(ctx, "cat-file", "--batch").
112110
SetDescription(fmt.Sprintf("%s cat-file --batch [repo_path: %s] (%s:%d)", GitExecutable, repoPath, filename, line)).
113-
RunWithContext(&RunContext{
114-
Timeout: -1,
115-
Dir: repoPath,
116-
Stdin: batchStdinReader,
117-
Stdout: batchStdoutWriter,
118-
Stderr: &stderr,
111+
Run(&RunOpts{
112+
Dir: repoPath,
113+
Stdin: batchStdinReader,
114+
Stdout: batchStdoutWriter,
115+
Stderr: &stderr,
119116
})
120117
if err != nil {
121118
_ = batchStdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))

0 commit comments

Comments
 (0)