From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 20 Feb 2021 14:02:39 +0000 (+0800)
Subject: Remove unused commit (#14741)
X-Git-Tag: v1.15.0-dev~146
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f3e64f677fd242850beafb1767504722f2dc2703;p=gitea.git

Remove unused commit (#14741)

* Remove unused commit

* a small nit

Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: a1012112796 <1012112796@qq.com>
---

diff --git a/models/migrations/v166.go b/models/migrations/v166.go
index 3d6cf4f57f..1b6e68b573 100644
--- a/models/migrations/v166.go
+++ b/models/migrations/v166.go
@@ -106,10 +106,8 @@ func recalculateUserEmptyPWD(x *xorm.Engine) (err error) {
 	}
 
 	// delete salt and algo where password is empty
-	if _, err = sess.Where(builder.Eq{"passwd": ""}.And(builder.Neq{"salt": ""}.Or(builder.Neq{"passwd_hash_algo": ""}))).
-		Cols("salt", "passwd_hash_algo").Update(&User{}); err != nil {
-		return err
-	}
+	_, err = sess.Where(builder.Eq{"passwd": ""}.And(builder.Neq{"salt": ""}.Or(builder.Neq{"passwd_hash_algo": ""}))).
+		Cols("salt", "passwd_hash_algo").Update(&User{})
 
-	return sess.Commit()
+	return err
 }