Re: [PATCH v2 2/3] home_config_path: allow NULL xdg parameter

2014-07-25 Thread Junio C Hamano
Matthieu Moy  writes:

> This allows a caller to request the global config file without requesting
> the XDG one.
>
> Signed-off-by: Matthieu Moy 
> ---

Will rephrase

A caller can ask only for XDG location by passing global=NULL.
Allow it to ask only for the $HOME/.gitconfig by passing
xdg=NULL.

as you seem to have forgotten ;-)

>  path.c | 10 ++
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/path.c b/path.c
> index 3afcdb4..f68df0c 100644
> --- a/path.c
> +++ b/path.c
> @@ -148,10 +148,12 @@ void home_config_paths(char **global, char **xdg, char 
> *file)
>   *global = mkpathdup("%s/.gitconfig", home);
>   }
>  
> - if (!xdg_home)
> - *xdg = NULL;
> - else
> - *xdg = mkpathdup("%s/git/%s", xdg_home, file);
> + if (xdg) {
> + if (!xdg_home)
> + *xdg = NULL;
> + else
> + *xdg = mkpathdup("%s/git/%s", xdg_home, file);
> + }
>  
>   free(to_free);
>  }
--
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 v2 2/3] home_config_path: allow NULL xdg parameter

2014-07-25 Thread Matthieu Moy
This allows a caller to request the global config file without requesting
the XDG one.

Signed-off-by: Matthieu Moy 
---
 path.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/path.c b/path.c
index 3afcdb4..f68df0c 100644
--- a/path.c
+++ b/path.c
@@ -148,10 +148,12 @@ void home_config_paths(char **global, char **xdg, char 
*file)
*global = mkpathdup("%s/.gitconfig", home);
}
 
-   if (!xdg_home)
-   *xdg = NULL;
-   else
-   *xdg = mkpathdup("%s/git/%s", xdg_home, file);
+   if (xdg) {
+   if (!xdg_home)
+   *xdg = NULL;
+   else
+   *xdg = mkpathdup("%s/git/%s", xdg_home, file);
+   }
 
free(to_free);
 }
-- 
2.0.2.737.gfb43bde

--
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