tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1

update code.gitea.io/git in vendor to fix #2245 (#2250)

Browse source
This commit is contained in:
Lauris BH 2017-08-03 16:48:36 +03:00 committed by Lunny Xiao
parent 4c54139afc
commit a4ca54425f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vendor/code.gitea.io/git/repo_branch.go generated vendored
View file

@ -86,10 +86,12 @@ type DeleteBranchOptions struct {
// DeleteBranch delete a branch by name on repository. // DeleteBranch delete a branch by name on repository.
func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) error { func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) error {
cmd := NewCommand("branch", "-d") cmd := NewCommand("branch")
if opts.Force { if opts.Force {
cmd.AddArguments("-f") cmd.AddArguments("-D")
} else {
cmd.AddArguments("-d")
} }
cmd.AddArguments(name) cmd.AddArguments(name)

6
vendor/vendor.json vendored
View file

@ -3,10 +3,10 @@
"ignore": "test appengine", "ignore": "test appengine",
"package": [ "package": [
{ {
"checksumSHA1": "oWPkH7I+FSu9dYZCz8rtuS/R8fo=", "checksumSHA1": "fR5YDSoG7xYv2aLO23rne95gWps=",
"path": "code.gitea.io/git", "path": "code.gitea.io/git",
"revision": "fc639668937225e1b9cda203b3491869b439a951", "revision": "479f87e5d189e7b8f1fd51dbcd25faa32b632cd2",
"revisionTime": "2017-07-10T08:37:35Z" "revisionTime": "2017-08-03T00:53:29Z"
}, },
{ {
"checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=", "checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=",