davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-18 17:00:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

notice

Browse source
This commit is contained in:
Unknwon 2015-11-20 11:37:17 -05:00
parent 6b30b20765
commit 6a6a7512c2
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/pull.go
View file

@ -193,7 +193,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),
fmt.Sprintf("PullRequest.Merge (git merge --no-ff --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]: %v - %s", tmpBasePath, err, stderr)
}