diff options
| author | zeripath <art27@cantab.net> | 2019-08-05 21:39:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 21:39:39 +0100 |
| commit | 7ad67109d732bd560c8da0356aa555be467d786c (patch) | |
| tree | 7c7a35761b01e2eec6a823f0caf40748c3b7f327 /modules/git/repo_compare.go | |
| parent | 1d8915ad5d9889c02dd98ab2c2f29aa8f5ee4dfa (diff) | |
| download | gitea-7ad67109d732bd560c8da0356aa555be467d786c.tar.gz gitea-7ad67109d732bd560c8da0356aa555be467d786c.zip | |
Be more strict with git arguments (#7715)
* Be more strict with git arguments
* fix-up commit test
* use bindings for branch name
Diffstat (limited to 'modules/git/repo_compare.go')
| -rw-r--r-- | modules/git/repo_compare.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index ddc8109720..7d66a2dc07 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -39,7 +39,7 @@ func (repo *Repository) GetMergeBase(tmpRemote string, base, head string) (strin } } - stdout, err := NewCommand("merge-base", base, head).RunInDir(repo.Path) + stdout, err := NewCommand("merge-base", "--", base, head).RunInDir(repo.Path) return strings.TrimSpace(stdout), base, err } |