Browse Source

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

tags/v1.2.0-rc1
Lauris BH Lunny Xiao 8 years ago
parent
commit
772f1558c9
2 changed files with 7 additions and 5 deletions
  1. +4
    -2
      vendor/code.gitea.io/git/repo_branch.go
  2. +3
    -3
      vendor/vendor.json

+ 4
- 2
vendor/code.gitea.io/git/repo_branch.go 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)


+ 3
- 3
vendor/vendor.json 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",
"revisionTime": "2017-07-10T08:37:35Z"
"revision": "479f87e5d189e7b8f1fd51dbcd25faa32b632cd2",
"revisionTime": "2017-08-03T00:53:29Z"
}, },
{ {
"checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=", "checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=",


Loading…
Cancel
Save