Merge pull request #821 from phsmit/fix_819

Fix #819 by fetching the repository from db before updating
2015-02-02 23:38:04 -05:00 · 2015-02-02 23:38:04 -05:00 · 902f19f70b
parent bfce0def25 44fa9147b7
commit 902f19f70b
1 changed files with 5 additions and 0 deletions
--- a/models/repo.go
+++ b/models/repo.go
@ -504,6 +504,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)