diff options
| author | Unknwon <u@gogs.io> | 2015-11-15 14:41:36 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-15 14:41:36 -0500 |
| commit | 4f03b81ec777813820d4e33ec11893e214ec27d2 (patch) | |
| tree | acf445918b155547a47f40e840a52aaa6332096c /models/pull.go | |
| parent | b4970b3cc31d09b2b74d1ace4bfb39ab494d8d24 (diff) | |
| download | gitea-4f03b81ec777813820d4e33ec11893e214ec27d2.tar.gz gitea-4f03b81ec777813820d4e33ec11893e214ec27d2.zip | |
#1931 Test patch does not checkout correct base branch
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 56af5f828d..094cb9b26a 100644 --- a/models/pull.go +++ b/models/pull.go @@ -218,6 +218,7 @@ var patchConflicts = []string{ } // testPatch checks if patch can be merged to base repository without conflit. +// FIXME: make a mechanism to clean up stable local copies. func (pr *PullRequest) testPatch() (err error) { if pr.BaseRepo == nil { pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID) @@ -243,8 +244,16 @@ func (pr *PullRequest) testPatch() (err error) { return fmt.Errorf("UpdateLocalCopy: %v", err) } - pr.Status = PULL_REQUEST_STATUS_CHECKING + // Checkout base branch. _, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(), + fmt.Sprintf("PullRequest.Merge(git checkout): %s", pr.BaseRepo.ID), + "git", "checkout", pr.BaseBranch) + if err != nil { + return fmt.Errorf("git checkout: %s", stderr) + } + + pr.Status = PULL_REQUEST_STATUS_CHECKING + _, stderr, err = process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(), fmt.Sprintf("testPatch(git apply --check): %d", pr.BaseRepo.ID), "git", "apply", "--check", patchPath) if err != nil { |