[PATCH 5/6] Revert "sequencer: allow callers of read_author_script() to ignore fields"

From

PWPhillip Wood <phillip.wood123@gmail.com>

Date

Apr 7, 2020, 14:11 UTC

Message-ID

<20200407141125.30872-6-phillip.wood123@gmail.com>

In-Reply-To

<20200407141125.30872-1-phillip.wood123@gmail.com>

From: Phillip Wood <phillip.wood@dunelm.org.uk>

This reverts commit c068bcc59b4f16322a77b6a47b53d44b05c51fec.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 sequencer.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 56f6e49289..17c7b18245 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -825,19 +825,9 @@ int read_author_script(const char *path, char **name, char **email, char **date,
 		error(_("missing 'GIT_AUTHOR_DATE'"));
 	if (date_i < 0 || email_i < 0 || date_i < 0 || err)
 		goto finish;
-
-	if (name)
-		*name = kv.items[name_i].util;
-	else
-		free(kv.items[name_i].util);
-	if (email)
-		*email = kv.items[email_i].util;
-	else
-		free(kv.items[email_i].util);
-	if (date)
-		*date = kv.items[date_i].util;
-	else
-		free(kv.items[date_i].util);
+	*name = kv.items[name_i].util;
+	*email = kv.items[email_i].util;
+	*date = kv.items[date_i].util;
 	retval = 0;
 finish:
 	string_list_clear(&kv, !!retval);

-- 
2.26.0