diff --git a/modules/git/commit_convert_gogit.go b/modules/git/commit_convert_gogit.go
index 92ad1d21fda..2f038f5605e 100644
--- a/modules/git/commit_convert_gogit.go
+++ b/modules/git/commit_convert_gogit.go
@@ -65,11 +65,11 @@ func convertPGPSignature(c *object.Commit) *CommitSignature {
 
 func convertCommit(c *object.Commit) *Commit {
 	return &Commit{
-		ID:            ParseGogitHash(c.Hash),
-		CommitMessage: CommitMessage{MessageRaw: c.Message},
-		Committer:     &c.Committer,
-		Author:        &c.Author,
-		Signature:     convertPGPSignature(c),
-		Parents:       ParseGogitHashArray(c.ParentHashes),
+		ID:         ParseGogitHash(c.Hash),
+		MessageRaw: c.Message,
+		Committer:  &c.Committer,
+		Author:     &c.Author,
+		Signature:  convertPGPSignature(c),
+		Parents:    ParseGogitHashArray(c.ParentHashes),
 	}
 }
diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go
index 4e256189c78..35f6a0c4942 100644
--- a/modules/git/repo_tag_gogit.go
+++ b/modules/git/repo_tag_gogit.go
@@ -66,12 +66,12 @@ func (repo *Repository) getTag(ctx context.Context, tagID ObjectID, name string)
 			return nil, err
 		}
 		tag := &Tag{
-			Name:          name,
-			ID:            tagID,
-			Object:        commitID,
-			Type:          tp,
-			Tagger:        commit.Committer,
-			CommitMessage: CommitMessage{MessageRaw: commit.CommitMessage.MessageRaw},
+			Name:       name,
+			ID:         tagID,
+			Object:     commitID,
+			Type:       tp,
+			Tagger:     commit.Committer,
+			MessageRaw: commit.CommitMessage.MessageRaw,
 		}
 
 		repo.tagCache.Set(tagID.String(), tag)
@@ -88,12 +88,12 @@ func (repo *Repository) getTag(ctx context.Context, tagID ObjectID, name string)
 	}
 
 	tag := &Tag{
-		Name:          name,
-		ID:            tagID,
-		Object:        commitID.Type().MustID(gogitTag.Target[:]),
-		Type:          tp,
-		Tagger:        &gogitTag.Tagger,
-		CommitMessage: CommitMessage{MessageRaw: gogitTag.Message},
+		Name:       name,
+		ID:         tagID,
+		Object:     commitID.Type().MustID(gogitTag.Target[:]),
+		Type:       tp,
+		Tagger:     &gogitTag.Tagger,
+		MessageRaw: gogitTag.Message,
 	}
 
 	repo.tagCache.Set(tagID.String(), tag)