diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2022-03-22 00:55:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 00:55:36 +0800 |
| commit | 3c49a6173d9cdf339f4a27d427a4cfc3dd51a24f (patch) | |
| tree | 4ed73e5a8ea82695a073b74fd9b53a874f7bfca7 /internal/db/pull.go | |
| parent | d66fe583d5f1e0ea5b50aa478ae1dcf3bd69fe7c (diff) | |
mod: bump github.com/gogs/git-module from 1.2.0 to 1.4.0 (#6866)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joe Chen <jc@unknwon.io>
Diffstat (limited to 'internal/db/pull.go')
| -rw-r--r-- | internal/db/pull.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/db/pull.go b/internal/db/pull.go index d226f2d8..b1f751b8 100644 --- a/internal/db/pull.go +++ b/internal/db/pull.go @@ -634,12 +634,12 @@ func (pr *PullRequest) UpdatePatch() (err error) { // Add a temporary remote. tmpRemote := com.ToStr(time.Now().UnixNano()) baseRepoPath := RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name) - err = headGitRepo.AddRemote(tmpRemote, baseRepoPath, git.AddRemoteOptions{Fetch: true}) + err = headGitRepo.RemoteAdd(tmpRemote, baseRepoPath, git.RemoteAddOptions{Fetch: true}) if err != nil { return fmt.Errorf("add remote %q [repo_id: %d]: %v", tmpRemote, pr.HeadRepoID, err) } defer func() { - if err := headGitRepo.RemoveRemote(tmpRemote); err != nil { + if err := headGitRepo.RemoteRemove(tmpRemote); err != nil { log.Error("Failed to remove remote %q [repo_id: %d]: %v", tmpRemote, pr.HeadRepoID, err) } }() @@ -678,13 +678,13 @@ func (pr *PullRequest) PushToBaseRepo() (err error) { } tmpRemote := fmt.Sprintf("tmp-pull-%d", pr.ID) - if err = headGitRepo.AddRemote(tmpRemote, pr.BaseRepo.RepoPath()); err != nil { + if err = headGitRepo.RemoteAdd(tmpRemote, pr.BaseRepo.RepoPath()); err != nil { return fmt.Errorf("add remote %q [repo_id: %d]: %v", tmpRemote, pr.HeadRepoID, err) } // Make sure to remove the remote even if the push fails defer func() { - if err := headGitRepo.RemoveRemote(tmpRemote); err != nil { + if err := headGitRepo.RemoteRemove(tmpRemote); err != nil { log.Error("Failed to remove remote %q [repo_id: %d]: %v", tmpRemote, pr.HeadRepoID, err) } }() |