fine tune

Author: wxiaoguang

models/user/user.go

@@ -1151,7 +1151,7 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([
 	}
 
 	for _, c := range oldCommits {
-		user := emailUserMap.GetByEmail(c.Author.Email)
+		user := emailUserMap.GetByEmail(c.Author.Email) // FIXME: why ValidateCommitsWithEmails uses "Author", but ParseCommitsWithSignature uses "Committer"?
 		if user == nil {
 			user = &User{
 				Name:  c.Author.Name,

models/user/user_test.go

@@ -62,13 +62,13 @@ func TestUserEmails(t *testing.T) {
 		testGetUserByEmail := func(t *testing.T, email string, uid int64) {
 			m, err := user_model.GetUsersByEmails(db.DefaultContext, []string{email})
 			require.NoError(t, err)
-			u := m.GetByEmail(email)
+			user := m.GetByEmail(email)
 			if uid == 0 {
-				require.Nil(t, u)
-			} else {
-				require.NotNil(t, u)
-				assert.EqualValues(t, uid, u.ID)
+				require.Nil(t, user)
+				return
 			}
+			require.NotNil(t, user)
+			assert.EqualValues(t, uid, user.ID)
 		}
 		cases := []struct {
 			Email string
@@ -78,6 +78,7 @@ func TestUserEmails(t *testing.T) {
 			{"[email protected]", 1},
 			{"USER2@" + setting.Service.NoReplyAddress, 2},
 			{"[email protected]", 4},
+			{"no-such", 0},
 		}
 		for _, c := range cases {
 			t.Run(c.Email, func(t *testing.T) {

services/git/commit.go

@@ -34,7 +34,7 @@ func ParseCommitsWithSignature(ctx context.Context, repo *repo_model.Repository,
 	}
 
 	for _, c := range oldCommits {
-		committerUser := emailUsers.GetByEmail(c.Committer.Email)
+		committerUser := emailUsers.GetByEmail(c.Committer.Email) // FIXME: why ValidateCommitsWithEmails uses "Author", but ParseCommitsWithSignature uses "Committer"?
 		if committerUser == nil {
 			committerUser = &user_model.User{
 				Name:  c.Committer.Name,