diff --git a/models/repo.go b/models/repo.go
index 2a355e81e19b..15ddaa2eda8b 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -615,8 +615,6 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
 		if err = initRepoCommit(tmpDir, u.NewGitSig()); err != nil {
 			return fmt.Errorf("initRepoCommit: %v", err)
 		}
-	} else {
-		repo.IsBare = true
 	}
 
 	// Re-fetch the repository from database before updating it (else it would
@@ -625,6 +623,10 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
 		return fmt.Errorf("getRepositoryByID: %v", err)
 	}
 
+	if !opts.AutoInit {
+		repo.IsBare = true
+	}
+
 	repo.DefaultBranch = "master"
 	if err = updateRepository(e, repo, false); err != nil {
 		return fmt.Errorf("updateRepository: %v", err)