diff options
| author | 6543 <6543@obermui.de> | 2022-02-06 20:01:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 20:01:47 +0100 |
| commit | 3043eb36bfcd7ddf29202b958b91942826a8182b (patch) | |
| tree | f6bfcb38648f07ff8132558ff826b8b1aac003ec /models/migrations/v134.go | |
| parent | 8ae5e6d7fdd577ebf0807bf33a4cdeef35d254d9 (diff) | |
| download | gitea-3043eb36bfcd7ddf29202b958b91942826a8182b.tar.gz gitea-3043eb36bfcd7ddf29202b958b91942826a8182b.zip | |
Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)
Diffstat (limited to 'models/migrations/v134.go')
| -rw-r--r-- | models/migrations/v134.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/migrations/v134.go b/models/migrations/v134.go index df08cb39cc..3a8fd96b7c 100644 --- a/models/migrations/v134.go +++ b/models/migrations/v134.go @@ -80,7 +80,7 @@ func refixMergeBase(x *xorm.Engine) error { gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index) - parentsString, err := git.NewCommand("rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath) + parentsString, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath) if err != nil { 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) continue @@ -94,7 +94,7 @@ func refixMergeBase(x *xorm.Engine) error { args := append([]string{"merge-base", "--"}, parents[1:]...) args = append(args, gitRefName) - pr.MergeBase, err = git.NewCommand(args...).RunInDir(repoPath) + pr.MergeBase, err = git.NewCommand(git.DefaultContext, args...).RunInDir(repoPath) if err != nil { 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) continue |