summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-03-19 16:44:22 -0400
committerUnknwon <u@gogs.io>2015-03-19 16:44:22 -0400
commit7cf05645873634cd926bb16ff880840330305d5b (patch)
treeb6ea671b0a0552c01f5701810076dccb07ad4af5
parent1cb57b1a440373cec4fcca00aa43ad9000b9b0bb (diff)
downloadgitea-7cf05645873634cd926bb16ff880840330305d5b.tar.gz
gitea-7cf05645873634cd926bb16ff880840330305d5b.zip
update gopmfile
-rw-r--r--.gopmfile38
-rw-r--r--models/repo.go8
2 files changed, 22 insertions, 24 deletions
diff --git a/.gopmfile b/.gopmfile
index e28fe0d3c0..4d535c2372 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -5,33 +5,33 @@ path = github.com/gogits/gogs
github.com/bradfitz/gomemcache = commit:72a68649ba
github.com/Unknwon/cae = commit:2e70a1351b
github.com/Unknwon/com = commit:188d690b1a
-github.com/Unknwon/i18n = commit:1e88666229
-github.com/Unknwon/macaron = commit:e089393c3f
-github.com/codegangsta/cli = commit:6086d7927e
-github.com/go-sql-driver/mysql = commit:27633f0519
-github.com/go-xorm/core = commit:16cb27928f
-github.com/go-xorm/xorm = commit:f2d3be988e
+github.com/Unknwon/i18n = commit:7457d88830
+github.com/Unknwon/macaron = commit:93de4f3fad
+github.com/codegangsta/cli = commit:2bcd11f863
+github.com/go-sql-driver/mysql = commit:a197e5d405
+github.com/go-xorm/core = commit:be6e7ac47d
+github.com/go-xorm/xorm = commit:1f0dd9bef2
github.com/gogits/chardet = commit:2404f77725
github.com/gogits/go-gogs-client = commit:92e76d616a
-github.com/lib/pq = commit:835d5eb08d
-github.com/macaron-contrib/binding = commit:dc739fabc3
-github.com/macaron-contrib/cache = commit:b68f6b448f
-github.com/macaron-contrib/captcha = commit:066c50c7eb
+github.com/lib/pq = commit:30ed2200d7
+github.com/macaron-contrib/binding = commit:548a793679
+github.com/macaron-contrib/cache = commit:928d5c35cd
+github.com/macaron-contrib/captcha = commit:fbb8b1ebb5
github.com/macaron-contrib/csrf = commit:98ddf5a710
-github.com/macaron-contrib/i18n = commit:eeebd44f64
+github.com/macaron-contrib/i18n = commit:627d60fe6f
github.com/macaron-contrib/oauth2 = commit:8f394c3629
-github.com/macaron-contrib/session = commit:8e8d938b27
+github.com/macaron-contrib/session = commit:31e841d95c
github.com/macaron-contrib/toolbox = commit:acbfe36e16
-github.com/mattn/go-sqlite3 = commit:25d045f12a
+github.com/mattn/go-sqlite3 = commit:5253daf856
github.com/microcosm-cc/bluemonday = commit:fcd0f5074e
-github.com/nfnt/resize = commit:8f44931448
-github.com/russross/blackfriday = commit:77efab57b2
-github.com/shurcooL/go = commit:329f57438c
-golang.org/x/net =
-golang.org/x/text =
+github.com/nfnt/resize = commit:53e9ca890b
+github.com/russross/blackfriday = commit:6928e11ecd
+github.com/shurcooL/go = commit:bc30a0bd33
+golang.org/x/net = commit:0b492c5a96
+golang.org/x/text = commit:c6bc7e82e2
gopkg.in/ini.v1 = commit:4febc4104c
gopkg.in/redis.v2 = commit:e617904962
[res]
-include = conf|etc|public|scripts|templates
+include = etc|public|scripts|templates
diff --git a/models/repo.go b/models/repo.go
index 947667b644..cfab329bab 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -396,16 +396,14 @@ func createUpdateHook(repoPath string) error {
}
// InitRepository initializes README and .gitignore if needed.
-func initRepository(e Engine, f string, u *User, repo *Repository, initReadme bool, repoLang, license string) error {
- repoPath := RepoPath(u.Name, repo.Name)
-
+func initRepository(e Engine, repoPath string, u *User, repo *Repository, initReadme bool, repoLang, license string) error {
// Init bare new repository.
os.MkdirAll(repoPath, os.ModePerm)
_, stderr, err := process.ExecDir(-1, repoPath,
fmt.Sprintf("initRepository(git init --bare): %s", repoPath),
"git", "init", "--bare")
if err != nil {
- return errors.New("initRepository(git init --bare): " + stderr)
+ return errors.New("git init --bare: " + stderr)
}
if err := createUpdateHook(repoPath); err != nil {
@@ -432,7 +430,7 @@ func initRepository(e Engine, f string, u *User, repo *Repository, initReadme bo
fmt.Sprintf("initRepository(git clone): %s", repoPath),
"git", "clone", repoPath, tmpDir)
if err != nil {
- return errors.New("initRepository(git clone): " + stderr)
+ return errors.New("git clone: " + stderr)
}
// README