diff options
| author | Lauris BH <lauris@nix.lv> | 2017-08-03 16:48:36 +0300 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-08-03 21:48:36 +0800 |
| commit | a4ca54425f873d30e8afc323f86625e1980aa066 (patch) | |
| tree | 4f395b6d4b6640f95aea83779da67f8ffdc2fcc0 /vendor | |
| parent | 4c54139afc9884d349243a3f15f20e89b637df43 (diff) | |
| download | gitea-a4ca54425f873d30e8afc323f86625e1980aa066.tar.gz gitea-a4ca54425f873d30e8afc323f86625e1980aa066.zip | |
update code.gitea.io/git in vendor to fix #2245 (#2250)
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/code.gitea.io/git/repo_branch.go | 6 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/vendor/code.gitea.io/git/repo_branch.go b/vendor/code.gitea.io/git/repo_branch.go index bf9d198112..2cd9659316 100644 --- a/vendor/code.gitea.io/git/repo_branch.go +++ b/vendor/code.gitea.io/git/repo_branch.go @@ -86,10 +86,12 @@ type DeleteBranchOptions struct { // DeleteBranch delete a branch by name on repository. func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) error { - cmd := NewCommand("branch", "-d") + cmd := NewCommand("branch") if opts.Force { - cmd.AddArguments("-f") + cmd.AddArguments("-D") + } else { + cmd.AddArguments("-d") } cmd.AddArguments(name) diff --git a/vendor/vendor.json b/vendor/vendor.json index 9d6a3ac314..787ee1556b 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test appengine", "package": [ { - "checksumSHA1": "oWPkH7I+FSu9dYZCz8rtuS/R8fo=", + "checksumSHA1": "fR5YDSoG7xYv2aLO23rne95gWps=", "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=", |