Merge branch 'master' into next

diff --git a/repo-config.c b/repo-config.c
index 7e06d1a041dfd04d73b54362374f246d497b690f..127afd784c1fcdb531c1d3435f724d0041151e90 100644 (file)
--- a/repo-config.c
+++ b/repo-config.c
@@ -27,47 +27,50 @@ 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;
 
-       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));