diff options
Diffstat (limited to 'builtin-config.c')
| -rw-r--r-- | builtin-config.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/builtin-config.c b/builtin-config.c index 0a605e01ac..e5e243f27c 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -165,15 +165,21 @@ int cmd_config(int argc, const char **argv, const char *prefix) { int nongit = 0; char* value; - setup_git_directory_gently(&nongit); + const char *file = setup_git_directory_gently(&nongit); while (1 < argc) { if (!strcmp(argv[1], "--int")) type = T_INT; else if (!strcmp(argv[1], "--bool")) type = T_BOOL; - else if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l")) - return git_config(show_all_config); + else if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l")) { + if (argc != 2) + usage(git_config_set_usage); + if (git_config(show_all_config) < 0 && file && errno) + die("unable to read config file %s: %s", file, + strerror(errno)); + return 0; + } else if (!strcmp(argv[1], "--global")) { char *home = getenv("HOME"); if (home) { @@ -189,7 +195,12 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { if (argc < 3) usage(git_config_set_usage); - setenv(CONFIG_ENVIRONMENT, argv[2], 1); + if (!is_absolute_path(argv[2]) && file) + file = prefix_filename(file, strlen(file), + argv[2]); + else + file = argv[2]; + setenv(CONFIG_ENVIRONMENT, file, 1); argc--; argv++; } |