From e06558e2083e6281500cc1c91ac54425b91390fe Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 16 Nov 2015 21:18:04 -0500 Subject: [PATCH] #1922 Pull request fail to merge with BIN --- README.md | 2 +- gogs.go | 2 +- models/pull.go | 1 + modules/git/repo_pull.go | 2 +- templates/.VERSION | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1e363ded54..c649a382ac 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/gogs.go b/gogs.go index f8a39f3fc8..80f780e851 100644 --- a/gogs.go +++ b/gogs.go @@ -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()) diff --git a/models/pull.go b/models/pull.go index 094cb9b26a..5c7d4a3f90 100644 --- a/models/pull.go +++ b/models/pull.go @@ -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 } diff --git a/modules/git/repo_pull.go b/modules/git/repo_pull.go index 16b9536fe6..f9ea710062 100644 --- a/modules/git/repo_pull.go +++ b/modules/git/repo_pull.go @@ -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)) } diff --git a/templates/.VERSION b/templates/.VERSION index 87a10ba387..b0072b1394 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.13.1116 Beta \ No newline at end of file +0.7.14.1116 Beta \ No newline at end of file