test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

add more debug info

This commit is contained in:
Unknwon 2015-11-20 08:43:15 -05:00
parent 126228d146
commit 6b30b20765
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -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()