Merge branch 'maint'

diff --git a/builtin-config.c b/builtin-config.c
index 7d2063c1d2e9564306bb2807548f28a067ccdb88..e5e243f27cb7ecab11ac0933a361d066f5b35ea9 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -2,7 +2,7 @@
 #include "cache.h"
 
 static const char git_config_set_usage[] =
-"git-config [ --global | --system ] [ --bool | --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";
+"git-config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --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";
 
 static char *key;
 static regex_t *key_regexp;
@@ -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) {
@@ -186,6 +192,18 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                }
                else if (!strcmp(argv[1], "--system"))
                        setenv(CONFIG_ENVIRONMENT, ETC_GITCONFIG, 1);
+               else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) {
+                       if (argc < 3)
+                               usage(git_config_set_usage);
+                       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++;
+               }
                else if (!strcmp(argv[1], "--null") || !strcmp(argv[1], "-z")) {
                        term = '\0';
                        delim = '\n';