diff options
| author | Unknwon <u@gogs.io> | 2015-11-20 08:43:15 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-20 08:43:15 -0500 |
| commit | 6b30b20765e0895bae8ee957fdd08c0e2853329a (patch) | |
| tree | b6e79e3253765c37b87caea71596e6d2bb362616 /models/pull.go | |
| parent | 126228d14621d21c7f7f86f009511b007b336f6e (diff) | |
| download | gitea-6b30b20765e0895bae8ee957fdd08c0e2853329a.tar.gz gitea-6b30b20765e0895bae8ee957fdd08c0e2853329a.zip | |
add more debug info
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 587a959d65..f5f3630277 100644 --- a/models/pull.go +++ b/models/pull.go @@ -195,7 +195,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error if _, stderr, err = process.ExecDir(-1, tmpBasePath, fmt.Sprintf("PullRequest.Merge (git merge --no-commit): %s", tmpBasePath), "git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil { - return fmt.Errorf("git merge --no-ff --no-commit [%s]: %s", tmpBasePath, stderr) + return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr) } sig := doer.NewGitSig() |