test(git): collapse logRecord helpers into one function

The extra logRecordWithTrailers wrapper only existed to default trailers to empty; pass that as the last argument instead.

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Author: zachaller

internal/git/catfile_test.go

@@ -16,12 +16,9 @@ import (
 )
 
 // logRecord assembles one `git log -z --pretty=format:` record as git would emit it. Fields and
-// records share the same NUL separator, so records are joined with it too.
-func logRecord(sha, author, commitTime, subject, body, message string) string {
-	return logRecordWithTrailers(sha, author, commitTime, subject, body, message, "")
-}
-
-func logRecordWithTrailers(sha, author, commitTime, subject, body, message, trailers string) string {
+// records share the same NUL separator, so records are joined with it too. Pass "" for trailers
+// when the commit has none.
+func logRecord(sha, author, commitTime, subject, body, message, trailers string) string {
 	return strings.Join([]string{sha, author, commitTime, subject, body, message, trailers}, "\x00")
 }
 
@@ -30,8 +27,8 @@ var _ = Describe("parseCommitLogOutput", func() {
 		stdout := strings.Join([]string{
 			logRecord("abc123", "Alice Example", "2023-11-14T22:33:20-04:00", "feat: do something important",
 				"Body paragraph one.\n\nSigned-off-by: Alice Example <alice@example.com>\n",
-				"feat: do something important\n\nBody paragraph one.\n\nSigned-off-by: Alice Example <alice@example.com>\n"),
-			logRecord("def456", "Bob Example", "2023-11-14T22:33:20+00:00", "subject only", "", "subject only\n"),
+				"feat: do something important\n\nBody paragraph one.\n\nSigned-off-by: Alice Example <alice@example.com>\n", ""),
+			logRecord("def456", "Bob Example", "2023-11-14T22:33:20+00:00", "subject only", "", "subject only\n", ""),
 		}, "\x00")
 
 		results, err := git.ParseCommitLogOutput(stdout)
@@ -61,8 +58,8 @@ var _ = Describe("parseCommitLogOutput", func() {
 
 	It("preserves the empty fields of a commit with no message", func() {
 		stdout := strings.Join([]string{
-			logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "", "", ""),
-			logRecord("def456", "Bob", "2023-11-14T22:33:20+00:00", "subject", "", "subject\n"),
+			logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "", "", "", ""),
+			logRecord("def456", "Bob", "2023-11-14T22:33:20+00:00", "subject", "", "subject\n", ""),
 		}, "\x00")
 
 		results, err := git.ParseCommitLogOutput(stdout)
@@ -75,7 +72,7 @@ var _ = Describe("parseCommitLogOutput", func() {
 
 	It("keeps a message that contains the field separator's printable predecessors", func() {
 		results, err := git.ParseCommitLogOutput(
-			logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "s", "before\x1fafter\n", "s\n\nbefore\x1fafter\n"))
+			logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "s", "before\x1fafter\n", "s\n\nbefore\x1fafter\n", ""))
 		Expect(err).NotTo(HaveOccurred())
 		Expect(results["abc123"].State.Body).To(Equal("before\x1fafter"))
 	})
@@ -86,7 +83,7 @@ var _ = Describe("parseCommitLogOutput", func() {
 	})
 
 	It("parses the trailers field into a map with repeated keys", func() {
-		results, err := git.ParseCommitLogOutput(logRecordWithTrailers("abc123", "Alice", "2023-11-14T22:33:20+00:00", "s", "", "s\n",
+		results, err := git.ParseCommitLogOutput(logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "s", "", "s\n",
 			"Signed-off-by: A\nSigned-off-by: B\nPromoter-Description: \"a: b\"\n"))
 		Expect(err).NotTo(HaveOccurred())
 		Expect(results["abc123"].Trailers()).To(Equal(map[string][]string{
@@ -96,14 +93,14 @@ var _ = Describe("parseCommitLogOutput", func() {
 	})
 
 	It("returns an empty, non-nil trailer map for a commit without trailers", func() {
-		results, err := git.ParseCommitLogOutput(logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "s", "", "s\n"))
+		results, err := git.ParseCommitLogOutput(logRecord("abc123", "Alice", "2023-11-14T22:33:20+00:00", "s", "", "s\n", ""))
 		Expect(err).NotTo(HaveOccurred())
 		Expect(results["abc123"].Trailers()).NotTo(BeNil())
 		Expect(results["abc123"].Trailers()).To(BeEmpty())
 	})
 
 	It("rejects an unparsable committer time", func() {
-		_, err := git.ParseCommitLogOutput(logRecord("abc123", "Alice", "not-a-time", "s", "", "s\n"))
+		_, err := git.ParseCommitLogOutput(logRecord("abc123", "Alice", "not-a-time", "s", "", "s\n", ""))
 		Expect(err).To(MatchError(ContainSubstring("parse committer time")))
 	})
 })