Merge branch 'nd/include-if-wildmatch'

A buglet in configuration parser has been fixed.

* nd/include-if-wildmatch:
config: correct '**' matching in includeIf patterns

diff --combined config.c
index 0f0cdd8c0fc9ee40c1f56d1935c1816eb03601ad,afc1cd249717bd7cc8a7324f5b34fb5c983a82e4..c2846df3f1d3be68b376ea154e2607726f32d01c
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -242,7 -242,7 +242,7 @@@ again
        }
  
        ret = !wildmatch(pattern.buf + prefix, text.buf + prefix,
-                        icase ? WM_CASEFOLD : 0);
+                        WM_PATHNAME | (icase ? WM_CASEFOLD : 0));
  
        if (!ret && !already_tried_absolute) {
                /*
@@@ -1445,9 -1445,7 +1445,9 @@@ int git_default_config(const char *var
        if (starts_with(var, "core."))
                return git_default_core_config(var, value, cb);
  
 -      if (starts_with(var, "user."))
 +      if (starts_with(var, "user.") ||
 +          starts_with(var, "author.") ||
 +          starts_with(var, "committer."))
                return git_ident_config(var, value, cb);
  
        if (starts_with(var, "i18n."))
@@@ -2657,8 -2655,6 +2657,8 @@@ int git_config_set_gently(const char *k
  void git_config_set(const char *key, const char *value)
  {
        git_config_set_multivar(key, value, NULL, 0);
 +
 +      trace2_cmd_set_config(key, value);
  }
  
  /*