mirror of
https://github.com/gogs/gogs.git
synced 2025-12-22 00:00:07 +01:00
Fetch before Checkout when create pull request (#3699)
This commit is contained in:
@@ -19,7 +19,7 @@ github.com/go-xorm/core = commit:87aca22
|
|||||||
github.com/go-xorm/xorm = commit:3ad0b42
|
github.com/go-xorm/xorm = commit:3ad0b42
|
||||||
github.com/gogits/chardet = commit:2404f77
|
github.com/gogits/chardet = commit:2404f77
|
||||||
github.com/gogits/cron = commit:7f3990a
|
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-gogs-client = commit:98046bb
|
||||||
github.com/gogits/go-libravatar = commit:cd1abbd
|
github.com/gogits/go-libravatar = commit:cd1abbd
|
||||||
github.com/issue9/identicon = commit:d36b545
|
github.com/issue9/identicon = commit:d36b545
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ Gogs - Go Git Service [
|

|
||||||
|
|
||||||
##### 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 |
|
| Web | UI | Preview |
|
||||||
|:-------------:|:-------:|:-------:|
|
|:-------------:|:-------:|:-------:|
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ func checkVersion() {
|
|||||||
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
|
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
|
||||||
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
|
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
|
||||||
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
|
{"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"},
|
{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
|
||||||
}
|
}
|
||||||
for _, c := range checkers {
|
for _, c := range checkers {
|
||||||
|
|||||||
2
glide.lock
generated
2
glide.lock
generated
@@ -43,7 +43,7 @@ imports:
|
|||||||
- name: github.com/gogits/cron
|
- name: github.com/gogits/cron
|
||||||
version: 7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c
|
version: 7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c
|
||||||
- name: github.com/gogits/git-module
|
- name: github.com/gogits/git-module
|
||||||
version: 71292151e50d262429f29515dd077d7f5beb8c66
|
version: df1013f8eb4dc70de90bc5597bf560a4b7da802e
|
||||||
- name: github.com/gogits/go-gogs-client
|
- name: github.com/gogits/go-gogs-client
|
||||||
version: 98046bb98061fc6baa5bb86359af0b7c300d384a
|
version: 98046bb98061fc6baa5bb86359af0b7c300d384a
|
||||||
- name: github.com/gogits/go-libravatar
|
- name: github.com/gogits/go-libravatar
|
||||||
|
|||||||
2
gogs.go
2
gogs.go
@@ -17,7 +17,7 @@ import (
|
|||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.9.111.1223"
|
const APP_VER = "0.9.112.1223"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|||||||
@@ -482,6 +482,11 @@ func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {
|
|||||||
return fmt.Errorf("git clone %s: %v", branch, err)
|
return fmt.Errorf("git clone %s: %v", branch, err)
|
||||||
}
|
}
|
||||||
} else {
|
} 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{
|
if err := git.Checkout(localPath, git.CheckoutOptions{
|
||||||
Branch: branch,
|
Branch: branch,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
0.9.111.1223
|
0.9.112.1223
|
||||||
Reference in New Issue
Block a user