Merge branch 'js/config' into pu

[git.git] / repo-config.c

diff --git a/repo-config.c b/repo-config.c
index 7e06d1a..8c0bb20 100644 (file)
--- a/repo-config.c
+++ b/repo-config.c
@@ -27,47 +27,52 @@ static int show_config(const char* key_, const char* value_)
 {
        char value[256];
        const char *vptr = value;
+       int dup_error = 0;
 
        if (value_ == NULL)
                value_ = "";
 
-       if ((use_key_regexp || !strcmp(key_, key)) &&
-                       (!use_key_regexp ||
-                        !regexec(key_regexp, key_, 0, NULL, 0)) &&
-                       (regexp == NULL ||
+       if (!use_key_regexp && strcmp(key_, key))
+               return 0;
+       if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
+               return 0;
+       if (regexp != NULL &&
                         (do_not_match ^
-                         !regexec(regexp, value_, 0, NULL, 0)))) {
-               int dup_error = 0;
-               if (show_keys)
-                       printf("%s ", key_);
-               if (seen && !do_all)
-                       dup_error = 1;
-               if (type == T_INT)
-                       sprintf(value, "%d", git_config_int(key_, value_));
-               else if (type == T_BOOL)
-                       sprintf(value, "%s", git_config_bool(key_, value_)
-                                            ? "true" : "false");
-               else
-                       vptr = value_;
-               seen++;
-               if (dup_error) {
-                       error("More than one value for the key %s: %s",
-                             key_, vptr);
-               }
-               else
-                       printf("%s\n", vptr);
+                         regexec(regexp, value_, 0, NULL, 0)))
+               return 0;
+
+       if (show_keys)
+               printf("%s ", key_);
+       if (seen && !do_all)
+               dup_error = 1;
+       if (type == T_INT)
+               sprintf(value, "%d", git_config_int(key_, value_));
+       else if (type == T_BOOL)
+               vptr = git_config_bool(key_, value_) ? "true" : "false";
+       else
+               vptr = value_;
+       seen++;
+       if (dup_error) {
+               error("More than one value for the key %s: %s",
+                               key_, vptr);
        }
+       else
+               printf("%s\n", vptr);
+
        return 0;
 }
 
 static int get_value(const char* key_, const char* regex_)
 {
-       int i;
+       char *tl;
+       const char *home = getenv("HOME");
+       const char *global =  (home ? mkpath("%s/.gitconfig", home) : NULL);
 
-       key = malloc(strlen(key_)+1);
-       for (i = 0; key_[i]; i++)
-               key[i] = tolower(key_[i]);
-       key[i] = 0;
+       key = strdup(key_);
+       for (tl=key+strlen(key)-1; tl >= key && *tl != '.'; --tl)
+               *tl = tolower(*tl);
+       for (tl=key; *tl && *tl != '.'; ++tl)
+               *tl = tolower(*tl);
 
        if (use_key_regexp) {
                key_regexp = (regex_t*)malloc(sizeof(regex_t));
@@ -90,7 +95,13 @@ static int get_value(const char* key_, const char* regex_)
                }
        }
 
-       git_config(show_config);
+       if (do_all && global)
+               git_config_from_file(show_config, global);
+       if (!git_ignore_local_config)
+               git_config_from_file(show_config, git_path("config"));
+       if (!do_all && !seen)
+               git_config_from_file(show_config, global);
+
        free(key);
        if (regexp) {
                regfree(regexp);
@@ -105,7 +116,8 @@ static int get_value(const char* key_, const char* regex_)
 
 int main(int argc, const char **argv)
 {
-       setup_git_directory();
+       int nongit = 0;
+       setup_git_directory_gently(&nongit);
 
        while (1 < argc) {
                if (!strcmp(argv[1], "--int"))
@@ -114,6 +126,8 @@ int main(int argc, const char **argv)
                        type = T_BOOL;
                else if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l"))
                        return git_config(show_all_config);
+               else if (!strcmp(argv[1], "--no-local"))
+                       git_ignore_local_config = 1;
                else
                        break;
                argc--;