From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Sep 2018 21:31:40 +0000 (-0700)
Subject: Merge branch 'es/chain-lint-more'
X-Git-Tag: v2.19.0-rc2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9983f8965c0875cc6727e9644c84ff1dfc99372;p=thirdparty%2Fgit.git

Merge branch 'es/chain-lint-more'

The test linter code has learned that the end of here-doc mark
"EOF" can be quoted in a double-quote pair, not just in a
single-quote pair.

* es/chain-lint-more:
  chainlint: match "quoted" here-doc tags
---

e9983f8965c0875cc6727e9644c84ff1dfc99372
diff --cc t/chainlint.sed
index c80d2fad7a,1da58b554b..70df40e34b
--- a/t/chainlint.sed
+++ b/t/chainlint.sed
@@@ -94,10 -94,10 +94,10 @@@
  
  # here-doc -- swallow it to avoid false hits within its body (but keep the
  # command to which it was attached)
- /<<[ 	]*[-\\']*[A-Za-z0-9_]/ {
- 	s/^\(.*\)<<[ 	]*[-\\']*\([A-Za-z0-9_][A-Za-z0-9_]*\)'*/<\2>\1<</
+ /<<[ 	]*[-\\'"]*[A-Za-z0-9_]/ {
+ 	s/^\(.*\)<<[ 	]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
  	s/[ 	]*<<//
 -	:hereslurp
 +	:hered
  	N
  	/^<\([^>]*\)>.*\n[ 	]*\1[ 	]*$/!{
  		s/\n.*$//
@@@ -280,9 -281,9 +280,9 @@@ bfolde
  # found here-doc -- swallow it to avoid false hits within its body (but keep
  # the command to which it was attached)
  :heredoc
- s/^\(.*\)<<[ 	]*[-\\']*\([A-Za-z0-9_][A-Za-z0-9_]*\)'*/<\2>\1<</
+ s/^\(.*\)<<[ 	]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
  s/[ 	]*<<//
 -:hereslurpsub
 +:heredsub
  N
  /^<\([^>]*\)>.*\n[ 	]*\1[ 	]*$/!{
  	s/\n.*$//