From e06558e2083e6281500cc1c91ac54425b91390fe Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 16 Nov 2015 21:18:04 -0500 Subject: #1922 Pull request fail to merge with BIN --- modules/git/repo_pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/git/repo_pull.go') diff --git a/modules/git/repo_pull.go b/modules/git/repo_pull.go index 16b9536f..f9ea7100 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)) } -- cgit v1.2.3