diff options
| author | Unknwon <u@gogs.io> | 2015-11-16 21:18:04 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-16 21:18:04 -0500 |
| commit | e06558e2083e6281500cc1c91ac54425b91390fe (patch) | |
| tree | a8fffe9596dfedd08adf9e7bfe63bd217ba4309d /modules/git | |
| parent | 54fd4cc5fb4d37eb82183cf7a5f6dbe8ac72d62b (diff) | |
| download | gitea-e06558e2083e6281500cc1c91ac54425b91390fe.tar.gz gitea-e06558e2083e6281500cc1c91ac54425b91390fe.zip | |
#1922 Pull request fail to merge with BIN
Diffstat (limited to 'modules/git')
| -rw-r--r-- | modules/git/repo_pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
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)) } |