Browse Source

add more debug info

tags/v1.21.12.1
Unknwon 10 years ago
parent
commit
6b30b20765
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      models/pull.go

+ 1
- 1
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()


Loading…
Cancel
Save