diff --git a/.gopmfile b/.gopmfile index 5420b4794..bbd818390 100644 --- a/.gopmfile +++ b/.gopmfile @@ -19,7 +19,7 @@ github.com/go-xorm/core = commit:87aca22 github.com/go-xorm/xorm = commit:3ad0b42 github.com/gogits/chardet = commit:2404f77 github.com/gogits/cron = commit:7f3990a -github.com/gogits/git-module = commit:7129215 +github.com/gogits/git-module = commit:df1013f github.com/gogits/go-gogs-client = commit:98046bb github.com/gogits/go-libravatar = commit:cd1abbd github.com/issue9/identicon = commit:d36b545 diff --git a/README.md b/README.md index cf9fa42ee..d87346db9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current tip version: 0.9.111 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions ~~or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)~~) +##### Current tip version: 0.9.112 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions ~~or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)~~) | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/cmd/web.go b/cmd/web.go index 24a21657f..f15e1c5a5 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -93,7 +93,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.3"}, + {"github.com/gogits/git-module", git.Version, "0.4.5"}, {"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"}, } for _, c := range checkers { diff --git a/glide.lock b/glide.lock index a2867ea06..ddfec702b 100644 --- a/glide.lock +++ b/glide.lock @@ -43,7 +43,7 @@ imports: - name: github.com/gogits/cron version: 7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c - name: github.com/gogits/git-module - version: 71292151e50d262429f29515dd077d7f5beb8c66 + version: df1013f8eb4dc70de90bc5597bf560a4b7da802e - name: github.com/gogits/go-gogs-client version: 98046bb98061fc6baa5bb86359af0b7c300d384a - name: github.com/gogits/go-libravatar diff --git a/gogs.go b/gogs.go index 5c91fca74..569fc2e90 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.111.1223" +const APP_VER = "0.9.112.1223" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/repo.go b/models/repo.go index 010c9fad6..9cbb18727 100644 --- a/models/repo.go +++ b/models/repo.go @@ -482,6 +482,11 @@ func UpdateLocalCopyBranch(repoPath, localPath, branch string) error { return fmt.Errorf("git clone %s: %v", branch, err) } } else { + if err := git.Fetch(localPath, git.FetchRemoteOptions{ + Prune: true, + }); err != nil { + return fmt.Errorf("git fetch: %v", err) + } if err := git.Checkout(localPath, git.CheckoutOptions{ Branch: branch, }); err != nil { diff --git a/templates/.VERSION b/templates/.VERSION index 1ee4881fe..6dd3ad61e 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.111.1223 \ No newline at end of file +0.9.112.1223 \ No newline at end of file