1 files changed, 16 insertions, 35 deletions

diff --git a/models/repo.go b/models/repo.go
index f2df050577..54177bb6fb 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -626,46 +626,25 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
 		return err
 	}
 
-	// Update accesses.
-	/*accesses := make([]Access, 0, 10)
-	if err = x.Find(&accesses, &Access{RepoName: u.LowerName + "/" + repo.LowerName}); err != nil {
-		return err
-	}*/
-
 	sess := x.NewSession()
 	defer sess.Close()
 	if err = sess.Begin(); err != nil {
 		return err
 	}
 
-	access := &Access{
-		RepoName: newUser.LowerName + "/" + repo.LowerName,
-	}
-
-	sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName)
-	_, err = sess.And("user_name = ?", u.LowerName).Update(&Access{UserName: newUser.LowerName})
-	if err != nil {
+	if _, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).
+		And("user_name = ?", u.LowerName).Update(&Access{UserName: newUser.LowerName}); err != nil {
 		sess.Rollback()
 		return err
 	}
 
-	_, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).Update(access)
-	if err != nil {
+	if _, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).Update(&Access{
+		RepoName: newUser.LowerName + "/" + repo.LowerName,
+	}); err != nil {
 		sess.Rollback()
 		return err
 	}
 
-	/*
-		for i := range accesses {
-			accesses[i].RepoName = newUser.LowerName + "/" + repo.LowerName
-			if accesses[i].UserName == u.LowerName {
-				accesses[i].UserName = newUser.LowerName
-			}
-			if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil {
-				return err
-			}
-		}*/
-
 	// Update repository.
 	repo.OwnerId = newUser.Id
 	if _, err := sess.Id(repo.Id).Update(repo); err != nil {
@@ -686,26 +665,28 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
 		return err
 	}
 
+	// Change repository directory name.
+	if err = os.Rename(RepoPath(u.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil {
+		sess.Rollback()
+		return err
+	}
+
+	if err = sess.Commit(); err != nil {
+		return err
+	}
+
 	// Add watch of new owner to repository.
 	if !IsWatching(newUser.Id, repo.Id) {
 		if err = WatchRepo(newUser.Id, repo.Id, true); err != nil {
-			sess.Rollback()
 			return err
 		}
 	}
 
 	if err = TransferRepoAction(u, newUser, repo); err != nil {
-		sess.Rollback()
 		return err
 	}
 
-	// Change repository directory name.
-	if err = os.Rename(RepoPath(u.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil {
-		sess.Rollback()
-		return err
-	}
-
-	return sess.Commit()
+	return nil
 }
 
 // ChangeRepositoryName changes all corresponding setting from old repository name to new one.