Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH v2] config: allow ~/ and ~user/ in include.path value

From: Matthieu Moy <hidden>
Date: 2016-06-15 22:53:40

Jeff King [off-list ref] writes:
 Documentation/config.txt  |    5 ++++-
 t/t1305-config-include.sh |    8 ++++++++
Nice, thanks.
quoted hunk
--- a/config.c
+++ b/config.c
@@ -37,6 +37,11 @@ static int handle_path_include(const char *path, struct config_include_data *inc
 {
 	int ret = 0;
 	struct strbuf buf = STRBUF_INIT;
+	char *expanded = expand_user_path(path);
+
+	if (!expanded)
+		return error("Could not expand include path '%s'", path);
+	path = expanded;
 
 	/*
 	 * Use an absolute path as-is, but interpret relative paths
@@ -63,6 +68,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
 		inc->depth--;
 	}
 	strbuf_release(&buf);
+	free(expanded);
Clearly better than my version.

Acked-by: Matthieu Moy <redacted>

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help