@@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra | |||
![](public/img/gogs-large-resize.png) | |||
##### Current version: 0.7.13 Beta | |||
##### Current version: 0.7.14 Beta | |||
<table> | |||
<tr> |
@@ -17,7 +17,7 @@ import ( | |||
"github.com/gogits/gogs/modules/setting" | |||
) | |||
const APP_VER = "0.7.13.1116 Beta" | |||
const APP_VER = "0.7.14.1116 Beta" | |||
func init() { | |||
runtime.GOMAXPROCS(runtime.NumCPU()) |
@@ -260,6 +260,7 @@ func (pr *PullRequest) testPatch() (err error) { | |||
for i := range patchConflicts { | |||
if strings.Contains(stderr, patchConflicts[i]) { | |||
log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID) | |||
fmt.Println(stderr) | |||
pr.Status = PULL_REQUEST_STATUS_CONFLICT | |||
return nil | |||
} |
@@ -89,7 +89,7 @@ func (repo *Repository) GetPullRequestInfo(basePath, baseBranch, headBranch stri | |||
// GetPatch generates and returns patch data between given branches. | |||
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 { | |||
return nil, concatenateError(err, string(stderr)) | |||
} |
@@ -1 +1 @@ | |||
0.7.13.1116 Beta | |||
0.7.14.1116 Beta |