From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Nov 2018 13:37:19 +0000 (+0900)
Subject: Merge branch 'nd/wildmatch-double-asterisk'
X-Git-Tag: v2.20.0-rc0~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/25e4da89edc5339019f0d7c29a21ef4e08cccf24?ds=inline;hp=-c

Merge branch 'nd/wildmatch-double-asterisk'

A pattern with '**' that does not have a slash on either side used
to be an invalid one, but the code now treats such double-asterisks
the same way as two normal asterisks that happen to be adjacent to
each other.

* nd/wildmatch-double-asterisk:
wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode
---

25e4da89edc5339019f0d7c29a21ef4e08cccf24
diff --combined Documentation/gitignore.txt
index d107daaffd,32b227942f..1c94f08ff4
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@@ -7,7 -7,7 +7,7 @@@ gitignore - Specifies intentionally unt
  
  SYNOPSIS
  --------
 -$HOME/.config/git/ignore, $GIT_DIR/info/exclude, .gitignore
 +$XDG_CONFIG_HOME/git/ignore, $GIT_DIR/info/exclude, .gitignore
  
  DESCRIPTION
  -----------
@@@ -129,7 -129,8 +129,8 @@@ full pathname may have special meaning
     matches zero or more directories. For example, "`a/**/b`"
     matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on.
  
-  - Other consecutive asterisks are considered invalid.
+  - Other consecutive asterisks are considered regular asterisks and
+    will match according to the previous rules.
  
  NOTES
  -----
diff --combined t/t3070-wildmatch.sh
index 46aca0af10,7ba5d35eb2..891d4d7cb9
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@@ -101,7 -101,8 +101,7 @@@ match_with_ls_files() 
  
  	match_stdout_stderr_cmp="
  		tr -d '\0' <actual.raw >actual &&
 -		>expect.err &&
 -		test_cmp expect.err actual.err &&
 +		test_must_be_empty actual.err &&
  		test_cmp expect actual"
  
  	if test "$match_expect" = 'E'
@@@ -237,7 -238,7 +237,7 @@@ match 0 0 0 0 foobar 'foo\*bar
  match 1 1 1 1 'f\oo' 'f\\oo'
  match 1 1 1 1 ball '*[al]?'
  match 0 0 0 0 ten '[ten]'
- match 0 0 1 1 ten '**[!te]'
+ match 1 1 1 1 ten '**[!te]'
  match 0 0 0 0 ten '**[!ten]'
  match 1 1 1 1 ten 't[a-g]n'
  match 0 0 0 0 ten 't[!a-g]n'
@@@ -253,7 -254,7 +253,7 @@@ match 1 1 1 1 ']' ']
  # Extended slash-matching features
  match 0 0 1 1 'foo/baz/bar' 'foo*bar'
  match 0 0 1 1 'foo/baz/bar' 'foo**bar'
- match 0 0 1 1 'foobazbar' 'foo**bar'
+ match 1 1 1 1 'foobazbar' 'foo**bar'
  match 1 1 1 1 'foo/baz/bar' 'foo/**/bar'
  match 1 1 0 0 'foo/baz/bar' 'foo/**/**/bar'
  match 1 1 1 1 'foo/b/a/z/bar' 'foo/**/bar'