From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Apr 2019 02:14:45 +0000 (+0900)
Subject: Merge branch 'nd/include-if-wildmatch'
X-Git-Tag: v2.22.0-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/078b254deb62d86c469c87ba4200c5a46fcb3a95?ds=inline;hp=-c

Merge branch 'nd/include-if-wildmatch'

A buglet in configuration parser has been fixed.

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

078b254deb62d86c469c87ba4200c5a46fcb3a95
diff --combined config.c
index 0f0cdd8c0f,afc1cd2497..c2846df3f1
--- a/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);
  }
  
  /*