Skip to content

Commit db148a4

Browse files
committed
Update function calls
1 parent d5e180e commit db148a4

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

models/pull.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,10 @@ func (pr *PullRequest) PushToBaseRepo() (err error) {
907907

908908
_ = os.Remove(file)
909909

910-
if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:%s", pr.HeadBranch, headFile)); err != nil {
910+
if err = git.Push(headRepoPath, git.PushOptions{
911+
Remote: tmpRemoteName,
912+
Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
913+
}); err != nil {
911914
return fmt.Errorf("Push: %v", err)
912915
}
913916

models/repo.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -2342,7 +2342,10 @@ func (repo *Repository) CreateNewBranch(doer *User, oldBranchName, branchName st
23422342
return fmt.Errorf("CreateNewBranch: %v", err)
23432343
}
23442344

2345-
if err = git.Push(localPath, "origin", branchName); err != nil {
2345+
if err = git.Push(localPath, git.PushOptions{
2346+
Remote: "origin",
2347+
Branch: branchName,
2348+
}); err != nil {
23462349
return fmt.Errorf("Push: %v", err)
23472350
}
23482351

models/repo_editor.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
136136
Message: opts.Message,
137137
}); err != nil {
138138
return fmt.Errorf("CommitChanges: %v", err)
139-
} else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil {
139+
} else if err = git.Push(localPath, git.PushOptions{
140+
Remote: "origin",
141+
Branch: opts.NewBranch,
142+
}); err != nil {
140143
return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
141144
}
142145

@@ -273,7 +276,10 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) (
273276
Message: opts.Message,
274277
}); err != nil {
275278
return fmt.Errorf("CommitChanges: %v", err)
276-
} else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil {
279+
} else if err = git.Push(localPath, git.PushOptions{
280+
Remote: "origin",
281+
Branch: opts.NewBranch,
282+
}); err != nil {
277283
return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
278284
}
279285

@@ -509,7 +515,10 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
509515
Message: opts.Message,
510516
}); err != nil {
511517
return fmt.Errorf("CommitChanges: %v", err)
512-
} else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil {
518+
} else if err = git.Push(localPath, git.PushOptions{
519+
Remote: "origin",
520+
Branch: opts.NewBranch,
521+
}); err != nil {
513522
return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
514523
}
515524

models/wiki.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,10 @@ func (repo *Repository) updateWikiPage(doer *User, oldWikiPath, wikiPath, conten
163163
Message: message,
164164
}); err != nil {
165165
return fmt.Errorf("CommitChanges: %v", err)
166-
} else if err = git.Push(localPath, "origin", "master"); err != nil {
166+
} else if err = git.Push(localPath, git.PushOptions{
167+
Remote: "origin",
168+
Branch: "master",
169+
}); err != nil {
167170
return fmt.Errorf("Push: %v", err)
168171
}
169172

@@ -209,7 +212,10 @@ func (repo *Repository) DeleteWikiPage(doer *User, wikiPath string) (err error)
209212
Message: message,
210213
}); err != nil {
211214
return fmt.Errorf("CommitChanges: %v", err)
212-
} else if err = git.Push(localPath, "origin", "master"); err != nil {
215+
} else if err = git.Push(localPath, git.PushOptions{
216+
Remote: "origin",
217+
Branch: "master",
218+
}); err != nil {
213219
return fmt.Errorf("Push: %v", err)
214220
}
215221

0 commit comments

Comments
 (0)