Fix #819 by fetching the repository from db before updating

diff --git a/models/repo.go b/models/repo.go
index 50b2b3fc25e884abc8cba5f3bfd6d443567f983d..495f1660c75bbefd600e6b0517d8358a86a4ad15 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -507,6 +507,11 @@ func initRepository(f string, u *User, repo *Repository, initReadme bool, repoLa
        }
 
        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.DefaultBranch = "master"
                return UpdateRepository(repo)