domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Upgrade vendor "git" (#161)

Browse source
This commit is contained in:
Thibault Meyer 2016-11-12 12:09:25 +01:00 • committed by GitHub
parent b339858500
commit 54e6ed3431
5 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/code.gitea.io/git/repo.go generated vendored
View file

@ -121,6 +121,7 @@ func Clone(from, to string, opts CloneRepoOptions) (err error) {
type PullRemoteOptions struct {
Timeout time.Duration
All bool
Rebase bool
Remote string
Branch string
}
@ -128,6 +129,9 @@ type PullRemoteOptions struct {
// Pull pulls changes from remotes.
func Pull(repoPath string, opts PullRemoteOptions) error {
cmd := NewCommand("pull")
if opts.Rebase {
cmd.AddArguments("--rebase")
}
if opts.All {
cmd.AddArguments("--all")
} else {