aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/gogits
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-02-15 18:34:02 -0500
committerUnknwon <u@gogs.io>2017-02-15 18:34:02 -0500
commitb9560ec9cbb05fddaa7ca0e2aee162a5ccdd0d01 (patch)
tree78ccbfe3046ff1b5795c1ac4cae68f84995a8ddc /vendor/github.com/gogits
parent189924cabf70a0a43b6c2d462d93b671aacdf2b8 (diff)
vendor: update git-module (#4128)
Diffstat (limited to 'vendor/github.com/gogits')
-rw-r--r--vendor/github.com/gogits/git-module/git.go2
-rw-r--r--vendor/github.com/gogits/git-module/repo_branch.go6
2 files changed, 5 insertions, 3 deletions
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)