summaryrefslogtreecommitdiffstats
path: root/models/repo.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-07 14:24:58 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-07 14:24:58 -0400
commit22feddf804c7fbf3418cbbc8e7302da271da4e5a (patch)
treec5f8fac19903327e78d5ac4f0fa2f8004a10974d /models/repo.go
parent7776f407b6cf7e4897377b73ef6235ecfd9f2a53 (diff)
downloadgitea-22feddf804c7fbf3418cbbc8e7302da271da4e5a.tar.gz
gitea-22feddf804c7fbf3418cbbc8e7302da271da4e5a.zip
Fix #66
Diffstat (limited to 'models/repo.go')
-rw-r--r--models/repo.go14
1 files changed, 10 insertions, 4 deletions
diff --git a/models/repo.go b/models/repo.go
index acee6f6af6..bb5c36372e 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -138,11 +138,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
IsPrivate: private,
IsBare: repoLang == "" && license == "" && !initReadme,
}
-
repoPath := RepoPath(user.Name, repoName)
- if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil {
- return nil, err
- }
+
sess := orm.NewSession()
defer sess.Close()
sess.Begin()
@@ -207,6 +204,10 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
log.Error("repo.CreateRepository(WatchRepo): %v", err)
}
+ if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil {
+ return nil, err
+ }
+
return repo, nil
}
@@ -332,6 +333,11 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
return nil
}
+ // for update use
+ os.Setenv("userName", user.Name)
+ os.Setenv("userId", base.ToStr(user.Id))
+ os.Setenv("repoName", repo.Name)
+
// Apply changes and commit.
return initRepoCommit(tmpDir, user.NewGitSig())
}