Merge branch 'fix-commit-committer-fields' into 'master'

Fix committer bug in go-git adapter

See merge request gitlab-org/gitaly!748

5 files changed, 68 insertions, 2 deletions

diff --git a/changelogs/unreleased/fix-commit-committer-fields.yml b/changelogs/unreleased/fix-commit-committer-fields.yml
new file mode 100644
index 000000000..8b8df18da
--- /dev/null
+++ b/changelogs/unreleased/fix-commit-committer-fields.yml
@@ -0,0 +1,5 @@
+---
+title: Fix committer bug in go-git adapter
+merge_request: 748
+author:
+type: fixed
diff --git a/internal/adapters/gogit/commit.go b/internal/adapters/gogit/commit.go
index 2d044b96b..64fe87eb3 100644
--- a/internal/adapters/gogit/commit.go
+++ b/internal/adapters/gogit/commit.go
@@ -57,8 +57,8 @@ func commitToProtoCommit(commit *object.Commit) *pb.GitCommit {
 	}
 	committer := pb.CommitAuthor{
 		Name:  []byte(commit.Committer.Name),
-		Email: []byte(commit.Author.Email),
-		Date:  &timestamp.Timestamp{Seconds: commit.Author.When.Unix()},
+		Email: []byte(commit.Committer.Email),
+		Date:  &timestamp.Timestamp{Seconds: commit.Committer.When.Unix()},
 	}
 
 	byteBody := []byte(body)
diff --git a/internal/adapters/gogit/commit_test.go b/internal/adapters/gogit/commit_test.go
index a363f4ddb..9fad9f915 100644
--- a/internal/adapters/gogit/commit_test.go
+++ b/internal/adapters/gogit/commit_test.go
@@ -78,6 +78,26 @@ func TestFindCommit(t *testing.T) {
 				BodySize:  12,
 			},
 		},
+		{
+			revision: "author-committer-different",
+			commit: &pb.GitCommit{
+				Id:      "77e835ef0856f33c4f0982f84d10bdb0567fe440",
+				Subject: []byte("Add file larger than 1 mb"),
+				Body:    []byte("Add file larger than 1 mb\n\nIn order to test Max File Size push rule we need a file larger than 1 MB\n"),
+				Author: &pb.CommitAuthor{
+					Name:  []byte("Ruben Davila"),
+					Email: []byte("rdavila84@gmail.com"),
+					Date:  &timestamp.Timestamp{Seconds: 1523247267},
+				},
+				Committer: &pb.CommitAuthor{
+					Name:  []byte("Jacob Vosmaer"),
+					Email: []byte("jacob@gitlab.com"),
+					Date:  &timestamp.Timestamp{Seconds: 1527855450},
+				},
+				ParentIds: []string{"60ecb67744cb56576c30214ff52294f8ce2def98"},
+				BodySize:  100,
+			},
+		},
 	}
 
 	for _, tc := range testCases {
diff --git a/internal/service/commit/find_commit_test.go b/internal/service/commit/find_commit_test.go
index 6e8b522ec..b0874a1df 100644
--- a/internal/service/commit/find_commit_test.go
+++ b/internal/service/commit/find_commit_test.go
@@ -197,6 +197,27 @@ func TestSuccessfulFindCommitRequest(t *testing.T) {
 			},
 		},
 		{
+			description: "with different author and committer",
+			revision:    "77e835ef0856f33c4f0982f84d10bdb0567fe440",
+			commit: &pb.GitCommit{
+				Id:      "77e835ef0856f33c4f0982f84d10bdb0567fe440",
+				Subject: []byte("Add file larger than 1 mb"),
+				Body:    []byte("Add file larger than 1 mb\n\nIn order to test Max File Size push rule we need a file larger than 1 MB\n"),
+				Author: &pb.CommitAuthor{
+					Name:  []byte("Ruben Davila"),
+					Email: []byte("rdavila84@gmail.com"),
+					Date:  &timestamp.Timestamp{Seconds: 1523247267},
+				},
+				Committer: &pb.CommitAuthor{
+					Name:  []byte("Jacob Vosmaer"),
+					Email: []byte("jacob@gitlab.com"),
+					Date:  &timestamp.Timestamp{Seconds: 1527855450},
+				},
+				ParentIds: []string{"60ecb67744cb56576c30214ff52294f8ce2def98"},
+				BodySize:  100,
+			},
+		},
+		{
 			description: "With a non-existing ref name",
 			revision:    "this-doesnt-exists",
 			commit:      nil,
diff --git a/internal/service/commit/find_commits_test.go b/internal/service/commit/find_commits_test.go
index b72f81d5d..d89a437f6 100644
--- a/internal/service/commit/find_commits_test.go
+++ b/internal/service/commit/find_commits_test.go
@@ -97,6 +97,26 @@ func TestFindCommitsFields(t *testing.T) {
 				BodySize:  12,
 			},
 		},
+		{
+			id: "77e835ef0856f33c4f0982f84d10bdb0567fe440",
+			commit: &pb.GitCommit{
+				Id:      "77e835ef0856f33c4f0982f84d10bdb0567fe440",
+				Subject: []byte("Add file larger than 1 mb"),
+				Body:    []byte("Add file larger than 1 mb\n\nIn order to test Max File Size push rule we need a file larger than 1 MB\n"),
+				Author: &pb.CommitAuthor{
+					Name:  []byte("Ruben Davila"),
+					Email: []byte("rdavila84@gmail.com"),
+					Date:  &timestamp.Timestamp{Seconds: 1523247267},
+				},
+				Committer: &pb.CommitAuthor{
+					Name:  []byte("Jacob Vosmaer"),
+					Email: []byte("jacob@gitlab.com"),
+					Date:  &timestamp.Timestamp{Seconds: 1527855450},
+				},
+				ParentIds: []string{"60ecb67744cb56576c30214ff52294f8ce2def98"},
+				BodySize:  100,
+			},
+		},
 	}
 
 	for _, tc := range testCases {