diff options
| -rw-r--r-- | cmd/web.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/gogits/git-module/git.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/gogits/git-module/repo_branch.go | 6 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
4 files changed, 9 insertions, 7 deletions
@@ -95,7 +95,7 @@ func checkVersion() { {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"}, - {"github.com/gogits/git-module", git.Version, "0.4.7"}, + {"github.com/gogits/git-module", git.Version, "0.4.8"}, {"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"}, } for _, c := range checkers { diff --git a/vendor/github.com/gogits/git-module/git.go b/vendor/github.com/gogits/git-module/git.go index 0b759312..f7a4d7fb 100644 --- a/vendor/github.com/gogits/git-module/git.go +++ b/vendor/github.com/gogits/git-module/git.go @@ -10,7 +10,7 @@ import ( "time" ) -const _VERSION = "0.4.7" +const _VERSION = "0.4.8" func Version() string { return _VERSION diff --git a/vendor/github.com/gogits/git-module/repo_branch.go b/vendor/github.com/gogits/git-module/repo_branch.go index f7252bb0..a5bf11de 100644 --- a/vendor/github.com/gogits/git-module/repo_branch.go +++ b/vendor/github.com/gogits/git-module/repo_branch.go @@ -88,10 +88,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 cf4ee883..fc3a2cae 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -159,10 +159,10 @@ "revisionTime": "2016-08-10T03:50:02Z" }, { - "checksumSHA1": "92bIqzmK6S5Pnq9HzqWva5mSDh4=", + "checksumSHA1": "PvpYCMEys67XcZPCZR27tRjnkHY=", "path": "github.com/gogits/git-module", - "revision": "47f896db1a82dc746d8cfd2930e4b29a2bd75e2c", - "revisionTime": "2017-02-15T09:08:23Z" + "revision": "a6d3c3660265eece3a34aef4f6ec4ce29b543294", + "revisionTime": "2017-02-15T23:32:44Z" }, { "checksumSHA1": "xvG+RgJODQqlmdAkHUQK2TyLR88=", |