git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] config: correct '**' matching in includeIf patterns

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 24, 2019, 12:56 UTC
Message-ID
<xmqq7ecoph14.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20190323034535.23364-1-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
Show 23 quoted lines
> The current wildmatch() call for includeIf's gitdir pattern does not
> pass the WM_PATHNAME flag. Without this flag, '*' is treated _almost_
> the same as '**' (because '*' also matches slashes) with one exception:
>
> '/**/' can match a single slash. The pattern 'foo/**/bar' matches
> 'foo/bar'.
>
> But '/*/', which is essentially what wildmatch engine sees without
> WM_PATHNAME, has to match two slashes (and '*' matches nothing). Which
> means 'foo/*/bar' cannot match 'foo/bar'. It can only match 'foo//bar'.
>
> The result of this is the current wildmatch() call works most of the
> time until the user depends on '/**/' matching no path component. The
> fix is straightforward.
>
> Reported-by: Jason Karns <jason.karns@gmail.com>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  Sorry I didn't notice this until Taylor's reply. Not sure how to
>  explain git-lfs behavior though.
>
>  config.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

The analysis above is very good, and the updated code is a natural consequence of the analysis; very well done.

Would it be easy to protect this fix from future breakages with a test or two?

Show 13 quoted lines
> diff --git a/config.c b/config.c
> index 0f0cdd8c0f..c2846df3f1 100644
> --- a/config.c
> +++ b/config.c
> @@ -242,7 +242,7 @@ static int include_by_gitdir(const struct config_options *opts,
>  	}
>  
>  	ret = !wildmatch(pattern.buf + prefix, text.buf + prefix,
> -			 icase ? WM_CASEFOLD : 0);
> +			 WM_PATHNAME | (icase ? WM_CASEFOLD : 0));
>  
>  	if (!ret && !already_tried_absolute) {
>  		/*
Previous: Nguyễn Thái Ngọc DuyNext: Nguyễn Thái Ngọc Duy
Message 4 of 9 in “[BUG] Suspected with double asterisk in conditional include pattern”
  1. Jason KarnsMar 14, 2019
  2. Taylor BlauMar 22, 2019
  3. config: correct '**' matching in includeIf patternsNguyễn Thái Ngọc Duy, Mar 23, 2019
  4. Junio C HamanoMar 24, 2019
  5. config: correct '**' matching in includeIf patternsNguyễn Thái Ngọc Duy, Mar 24, 2019
  6. Junio C HamanoMar 25, 2019
  7. Johannes SchindelinMar 25, 2019
  8. config: correct '**' matching in includeIf patternsNguyễn Thái Ngọc Duy, Mar 26, 2019
  9. Jason KarnsApr 30, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.