From 6b30b20765e0895bae8ee957fdd08c0e2853329a Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Fri, 20 Nov 2015 08:43:15 -0500
Subject: [PATCH] add more debug info
---
models/pull.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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()