repobase/repobase
1
0
Fork 0
Code Issues 8 Pull requests Projects 1 Releases Packages Wiki Activity Actions 4

minor update

Browse source
This commit is contained in:
Unknwon 2015-08-26 12:26:01 +08:00
parent 27f7abdd77
commit b3a45693c3
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
models/repo.go
View file

@ -575,15 +575,22 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, initRe
delete(fileName, "license")
}
// Re-fetch the repository from database before updating it (else it would
// override changes that were done earlier with sql)
if repo, err = getRepositoryByID(e, repo.ID); err != nil {
return fmt.Errorf("getRepositoryByID: %v", err)
}
if len(fileName) == 0 {
// Re-fetch the repository from database before updating it (else it would
// override changes that were done earlier with sql)
if repo, err = getRepositoryByID(e, repo.ID); err != nil {
return err
}
repo.IsBare = true
repo.DefaultBranch = "master"
return updateRepository(e, repo, false)
}
repo.DefaultBranch = "master"
if err = updateRepository(e, repo, false); err != nil {
return fmt.Errorf("updateRepository: %v", err)
}
// Ignore init process if user choose not to.
if len(fileName) == 0 {
return nil
}
// Apply changes and commit.