diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/models/pull.go b/models/pull.go index dfd80635..8020a1e1 100644 --- a/models/pull.go +++ b/models/pull.go @@ -252,7 +252,7 @@ func (pr *PullRequest) testPatch() (err error) { // Checkout base branch. _, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(), - fmt.Sprintf("PullRequest.Merge(git checkout): %s", pr.BaseRepo.ID), + fmt.Sprintf("PullRequest.Merge(git checkout): %v", pr.BaseRepo.ID), "git", "checkout", pr.BaseBranch) if err != nil { return fmt.Errorf("git checkout: %s", stderr) @@ -415,12 +415,7 @@ func (pr *PullRequest) UpdatePatch() (err error) { return fmt.Errorf("GetOwner: %v", err) } - headRepoPath, err := pr.HeadRepo.RepoPath() - if err != nil { - return fmt.Errorf("HeadRepo.RepoPath: %v", err) - } - - headGitRepo, err := git.OpenRepository(headRepoPath) + headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath()) if err != nil { return fmt.Errorf("OpenRepository: %v", err) } |