[PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-04-02 Thread Ramkumar Ramachandra 
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().

Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
 remote.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/remote.c b/remote.c
index ca1edd9..34ddc5b 100644
--- a/remote.c
+++ b/remote.c
@@ -357,9 +357,8 @@ 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(branch-remote_name, key, value))
+   return -1;
if (branch == current_branch) {
default_remote_name = branch-remote_name;
explicit_default_remote_name = 1;
-- 
1.8.2.363.g901f5bc

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-03-28 Thread Ramkumar Ramachandra 
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().

Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
 remote.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/remote.c b/remote.c
index 174e48e..02e6c4c 100644
--- a/remote.c
+++ b/remote.c
@@ -357,9 +357,8 @@ 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(branch-remote_name, key, value))
+   return -1;
if (branch == current_branch) {
default_remote_name = branch-remote_name;
explicit_default_remote_name = 1;
-- 
1.8.2.141.g3797f84

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-03-22 Thread Ramkumar Ramachandra 
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().

Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
 remote.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/remote.c b/remote.c
index e53a6eb..5bd59bb 100644
--- a/remote.c
+++ b/remote.c
@@ -356,9 +356,8 @@ 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(branch-remote_name, key, value))
+   return -1;
if (branch == current_branch) {
default_remote_name = branch-remote_name;
explicit_default_remote_name = 1;
-- 
1.8.2.62.ga35d936.dirty

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-03-22 Thread Jonathan Nieder 
Ramkumar Ramachandra wrote:

 A small segment where handle_config() parses the branch.remote
 configuration variable can be simplified using git_config_string().

Looks correct.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-03-20 Thread Ramkumar Ramachandra 
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().

Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
 remote.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/remote.c b/remote.c
index e53a6eb..45b69d6 100644
--- a/remote.c
+++ b/remote.c
@@ -356,9 +356,7 @@ 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);
+   git_config_string(branch-remote_name, key, value);
if (branch == current_branch) {
default_remote_name = branch-remote_name;
explicit_default_remote_name = 1;
-- 
1.8.2

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-03-20 Thread Jonathan Nieder 
Ramkumar Ramachandra wrote:

 --- a/remote.c
 +++ b/remote.c
 @@ -356,9 +356,7 @@ 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);
 + git_config_string(branch-remote_name, key, value);

Shouldn't this say

if (git_config_string(branch-remote_name, key, value))
return -1;

or something?

Thanks,
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/6] remote.c: simplify a bit of code using git_config_string()

2013-03-20 Thread Ramkumar Ramachandra 
Jonathan Nieder wrote:
 Ramkumar Ramachandra wrote:

 --- a/remote.c
 +++ b/remote.c
 @@ -356,9 +356,7 @@ 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);
 + git_config_string(branch-remote_name, key, value);

 Shouldn't this say

 if (git_config_string(branch-remote_name, key, 
 value))
 return -1;

 or something?

Yes, and so should the instances in [5/6] and [6/6].  Thanks for catching it.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html