X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-config.c;h=f71016204b540d0d935323c909a0ffccb1abdbe2;hb=45e2b6140147d7a8b2cd68399e4d52d5d8d7b5be;hp=39f63d7b10f93a0a021d8b9af9fdec46ed0333f6;hpb=633ce9a3ba973acf19a122e1359b7ae724887d70;p=git.git diff --git a/builtin-config.c b/builtin-config.c index 39f63d7b1..f71016204 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -3,7 +3,7 @@ #include "color.h" static const char git_config_set_usage[] = -"git-config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --int | --bool-or-int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list | --get-color var [default] | --get-colorbool name [stdout-is-tty]"; +"git config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --int | --bool-or-int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list | --get-color var [default] | --get-colorbool name [stdout-is-tty]"; static char *key; static regex_t *key_regexp; @@ -84,7 +84,7 @@ static int get_value(const char* key_, const char* regex_) local = config_exclusive_filename; if (!local) { const char *home = getenv("HOME"); - local = repo_config = xstrdup(git_path("config")); + local = repo_config = git_pathdup("config"); if (git_config_global() && home) global = xstrdup(mkpath("%s/.gitconfig", home)); if (git_config_system()) @@ -145,7 +145,7 @@ free_strings: return ret; } -char *normalize_value(const char *key, const char *value) +static char *normalize_value(const char *key, const char *value) { char *normalized;