mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 03:35:55 +01:00
#1922 Pull request fail to merge with BIN
This commit is contained in:
parent
54fd4cc5fb
commit
e06558e208
@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
|
|||||||
|
|
||||||
![](public/img/gogs-large-resize.png)
|
![](public/img/gogs-large-resize.png)
|
||||||
|
|
||||||
##### Current version: 0.7.13 Beta
|
##### Current version: 0.7.14 Beta
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
|
2
gogs.go
2
gogs.go
@ -17,7 +17,7 @@ import (
|
|||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.7.13.1116 Beta"
|
const APP_VER = "0.7.14.1116 Beta"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
@ -260,6 +260,7 @@ func (pr *PullRequest) testPatch() (err error) {
|
|||||||
for i := range patchConflicts {
|
for i := range patchConflicts {
|
||||||
if strings.Contains(stderr, patchConflicts[i]) {
|
if strings.Contains(stderr, patchConflicts[i]) {
|
||||||
log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID)
|
log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID)
|
||||||
|
fmt.Println(stderr)
|
||||||
pr.Status = PULL_REQUEST_STATUS_CONFLICT
|
pr.Status = PULL_REQUEST_STATUS_CONFLICT
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ func (repo *Repository) GetPullRequestInfo(basePath, baseBranch, headBranch stri
|
|||||||
|
|
||||||
// GetPatch generates and returns patch data between given branches.
|
// GetPatch generates and returns patch data between given branches.
|
||||||
func (repo *Repository) GetPatch(mergeBase, headBranch string) ([]byte, error) {
|
func (repo *Repository) GetPatch(mergeBase, headBranch string) ([]byte, error) {
|
||||||
stdout, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "diff", "-p", mergeBase, headBranch)
|
stdout, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "diff", "-p", "--binary", mergeBase, headBranch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, concatenateError(err, string(stderr))
|
return nil, concatenateError(err, string(stderr))
|
||||||
}
|
}
|
||||||
|
@ -1 +1 @@
|
|||||||
0.7.13.1116 Beta
|
0.7.14.1116 Beta
|
Loading…
Reference in New Issue
Block a user