Merge pull request #821 from phsmit/fix_819
Fix #819 by fetching the repository from db before updating
This commit is contained in:
commit
902f19f70b
1 changed files with 5 additions and 0 deletions
|
@ -504,6 +504,11 @@ func initRepository(f string, u *User, repo *Repository, initReadme bool, repoLa
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(fileName) == 0 {
|
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 _, err := x.Get(repo); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
repo.IsBare = true
|
repo.IsBare = true
|
||||||
repo.DefaultBranch = "master"
|
repo.DefaultBranch = "master"
|
||||||
return UpdateRepository(repo)
|
return UpdateRepository(repo)
|
||||||
|
|
Loading…
Reference in a new issue