[PATCH v2 2/4] ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`

From

Tanay Abhra <tanayabh@gmail.com>

Date

Aug 13, 2014, 12:43 UTC

Message-ID

<53EB5D58.7000300@gmail.com>

In-Reply-To

<vpqfvh0vd4a.fsf@anie.imag.fr>

Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
We cannot easily use the new config-set API here, because
much of the function is dedicated to processing
"merge.<name>.variable" which does not easily translate to
the new API. If it were for variables like,
"merge.summary", "merge.tool", and "merge.verbosity", we
could use the new API.

 ll-merge.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/ll-merge.c b/ll-merge.c
index fb61ea6..8ea03e5 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -225,11 +225,8 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 	const char *key, *name;
 	int namelen;

-	if (!strcmp(var, "merge.default")) {
-		if (value)
-			default_ll_merge = xstrdup(value);
-		return 0;
-	}
+	if (!strcmp(var, "merge.default"))
+		return git_config_string(&default_ll_merge, var, value);

 	/*
 	 * We are not interested in anything but "merge.<name>.variable";
@@ -254,12 +251,8 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 		ll_user_merge_tail = &(fn->next);
 	}

-	if (!strcmp("name", key)) {
-		if (!value)
-			return error("%s: lacks value", var);
-		fn->description = xstrdup(value);
-		return 0;
-	}
+	if (!strcmp("name", key))
+		return git_config_string(&fn->description, var, value);

 	if (!strcmp("driver", key)) {
 		if (!value)
@@ -285,12 +278,8 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 		return 0;
 	}

-	if (!strcmp("recursive", key)) {
-		if (!value)
-			return error("%s: lacks value", var);
-		fn->recursive = xstrdup(value);
-		return 0;
-	}
+	if (!strcmp("recursive", key))
+		return git_config_string(&fn->recursive, var, value);

 	return 0;
 }

-- 
1.9.0.GIT