From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Fri, 25 Jul 2014 19:11:35 +0000 (+0200)
Subject: home_config_paths(): let the caller ignore xdg path
X-Git-Tag: v2.2.0-rc0~180^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06b2d87244d74a6b084a08677dfd66d58b94ebfa;p=thirdparty%2Fgit.git

home_config_paths(): let the caller ignore xdg path

The caller can signal that it is not interested in learning
the location of $HOME/.gitconfig by passing global=NULL, but
there is no way to decline the path to the configuration
file based on $XDG_CONFIG_HOME.

Allow the caller to pass xdg=NULL to signal that it is not
interested in the XDG location.

Commit-message-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/path.c b/path.c
index c36f003930..1b6cdc407f 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);
 }