diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | templates/.VERSION | 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 | 11 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
5 files changed, 14 insertions, 9 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/pkg/setting" ) -const APP_VER = "0.11.31.1022" +const APP_VER = "0.11.32.1115" func init() { setting.AppVer = APP_VER diff --git a/templates/.VERSION b/templates/.VERSION index db402082..f3f207f6 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.31.1022
\ No newline at end of file +0.11.32.1115
\ No newline at end of file diff --git a/vendor/github.com/gogits/git-module/git.go b/vendor/github.com/gogits/git-module/git.go index 10673a90..414d67cd 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.6.3" +const _VERSION = "0.6.4" 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 a5bf11de..de3f6ca1 100644 --- a/vendor/github.com/gogits/git-module/repo_branch.go +++ b/vendor/github.com/gogits/git-module/repo_branch.go @@ -86,8 +86,8 @@ type DeleteBranchOptions struct { Force bool } -// DeleteBranch delete a branch by name on repository. -func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) error { +// DeleteBranch deletes a branch from given repository path. +func DeleteBranch(repoPath, name string, opts DeleteBranchOptions) error { cmd := NewCommand("branch") if opts.Force { @@ -97,11 +97,16 @@ func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) erro } cmd.AddArguments(name) - _, err := cmd.RunInDir(repo.Path) + _, err := cmd.RunInDir(repoPath) return err } +// DeleteBranch deletes a branch from repository. +func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) error { + return DeleteBranch(repo.Path, name, opts) +} + // AddRemote adds a new remote to repository. func (repo *Repository) AddRemote(name, url string, fetch bool) error { cmd := NewCommand("remote", "add") diff --git a/vendor/vendor.json b/vendor/vendor.json index 4485a824..67db82e5 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -183,10 +183,10 @@ "revisionTime": "2016-08-10T03:50:02Z" }, { - "checksumSHA1": "kPsa/ri8Vh9yHG8LQYgnH2Xa6YY=", + "checksumSHA1": "oSsxc1i4agO7Gp1kgiUxLDHCtKU=", "path": "github.com/gogits/git-module", - "revision": "1de103dca47a72afccccb4ccd6085110874f3551", - "revisionTime": "2017-06-08T20:55:22Z" + "revision": "0654b3dcf2e85ed96c9923cb65cae5341fe1df3f", + "revisionTime": "2017-11-16T04:59:35Z" }, { "checksumSHA1": "GBfb+meRaVNarQavLB/bzbDoBtY=", |