Merge branch 'dc/gitweb'

diff --git a/builtin-config.c b/builtin-config.c
index cb7e9e9391e33073efcf39f432acb760994244e8..f672c9cccaeb460a0f0c55ad3e9d2ada95ed1e81 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -81,7 +81,7 @@ static int get_value(const char* key_, const char* regex_)
                        local = repo_config = xstrdup(git_path("config"));
                if (home)
                        global = xstrdup(mkpath("%s/.gitconfig", home));
-               system_wide = ETC_GITCONFIG;
+               system_wide = git_etc_gitconfig();
        }
 
        key = xstrdup(key_);
@@ -165,7 +165,7 @@ 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"))
@@ -175,7 +175,10 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                else if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l")) {
                        if (argc != 2)
                                usage(git_config_set_usage);
-                       return git_config(show_all_config);
+                       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");
@@ -188,11 +191,16 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                        }
                }
                else if (!strcmp(argv[1], "--system"))
-                       setenv(CONFIG_ENVIRONMENT, ETC_GITCONFIG, 1);
+                       setenv(CONFIG_ENVIRONMENT, git_etc_gitconfig(), 1);
                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++;
                }