Signed-off-by: David Bryson <david@xxxxxxxxxxxxxxx>
I tried to keep with the naming/coding conventions that I found in
remote.c. Feedback welcome.
---
remote.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/remote.c b/remote.c
index 3f3c789..893a739 100644
--- a/remote.c
+++ b/remote.c
@@ -305,6 +305,7 @@ static int handle_config(const char *key, const char *value, void *cb)
{
const char *name;
const char *subkey;
+ const char *v;
struct remote *remote;
struct branch *branch;
if (!prefixcmp(key, "branch.")) {
@@ -314,15 +315,15 @@ static int handle_config(const char *key, const char *value, void *cb)
return 0;
branch = make_branch(name, subkey - name);
if (!strcmp(subkey, ".remote")) {
- if (!value)
- return config_error_nonbool(key);
- branch->remote_name = xstrdup(value);
+ if (git_config_string(&v, key, value) )
+ return -1;
+ branch->remote_name = v;
if (branch == current_branch)
default_remote_name = branch->remote_name;
} else if (!strcmp(subkey, ".merge")) {
- if (!value)
- return config_error_nonbool(key);
- add_merge(branch, xstrdup(value));
+ if (git_config_string(&v, key, value ))
+ return -1;
+ add_merge(branch, v);
}
return 0;
}
@@ -334,9 +335,9 @@ static int handle_config(const char *key, const char *value, void *cb)
return 0;
rewrite = make_rewrite(name, subkey - name);
if (!strcmp(subkey, ".insteadof")) {
- if (!value)
- return config_error_nonbool(key);
- add_instead_of(rewrite, xstrdup(value));
+ if (git_config_string(&v, key, value ))
+ return -1;
+ add_instead_of(rewrite, v);
}
}
if (prefixcmp(key, "remote."))
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
