Merge branch 'es/chain-lint-more'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 21:31:40 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 21:31:40 +0000 (14:31 -0700)
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

1  2 
t/chainlint.sed
diff --cc t/chainlint.sed
index c80d2fad7a85e2bf6f59b5a5acd80be5f688cb90,1da58b554b1b287c0107a2b49f6061f137224eab..70df40e34b7df81adcb9997ebcc8d7b063627b32
  
  # 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.*$//