diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-07-24 22:06:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-26 12:17:16 -0700 |
| commit | a03b097d6307763c6778f5a1f194fbcbd158a5f7 (patch) | |
| tree | 64e20e92d5b74c31ed5cd324b95545cf220ba12e /config.c | |
| parent | 644e6b2c0f55fa52de88586d375e03ac7f7914b7 (diff) | |
Use a better name for the function interpolating paths
It is not immediately clear what `expand_user_path()` means, so let's rename it to `interpolate_path()`. This also opens the path for interpolating more than just a home directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.c b/config.c index f9c400ad30..c17b979729 100644 --- a/config.c +++ b/config.c @@ -137,7 +137,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc if (!path) return config_error_nonbool("include.path"); - expanded = expand_user_path(path, 0); + expanded = interpolate_path(path, 0); if (!expanded) return error(_("could not expand include path '%s'"), path); path = expanded; @@ -185,7 +185,7 @@ static int prepare_include_condition_pattern(struct strbuf *pat) char *expanded; int prefix = 0; - expanded = expand_user_path(pat->buf, 1); + expanded = interpolate_path(pat->buf, 1); if (expanded) { strbuf_reset(pat); strbuf_addstr(pat, expanded); @@ -1270,7 +1270,7 @@ int git_config_pathname(const char **dest, const char *var, const char *value) { if (!value) return config_error_nonbool(var); - *dest = expand_user_path(value, 0); + *dest = interpolate_path(value, 0); if (!*dest) die(_("failed to expand user dir in: '%s'"), value); return 0; @@ -1844,7 +1844,7 @@ void git_global_config(char **user_out, char **xdg_out) char *xdg_config = NULL; if (!user_config) { - user_config = expand_user_path("~/.gitconfig", 0); + user_config = interpolate_path("~/.gitconfig", 0); xdg_config = xdg_config_home("config"); } |