diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2020-08-12 22:30:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-13 18:21:18 (GMT) |
| commit | 75c3b6b2e8a72239fa23e039c46f9a5cf8c24142 (patch) | |
| tree | 3a0d8f50ab7083c7ef75584c8f0f7be7499e2372 /t/t4018 | |
| parent | b79e6925f0ff8ae0afa6554224a5a2e1c41a4605 (diff) | |
| download | git-75c3b6b2e8a72239fa23e039c46f9a5cf8c24142.zip git-75c3b6b2e8a72239fa23e039c46f9a5cf8c24142.tar.gz git-75c3b6b2e8a72239fa23e039c46f9a5cf8c24142.tar.bz2 | |
userdiff: improve Fortran xfuncname regex
The third part of the Fortran xfuncname regex wants to match the
beginning of a subroutine or function, so it allows for all characters
except `'`, `"` or whitespace before the keyword 'function' or
'subroutine'. This is meant to match the 'recursive', 'elemental' or
'pure' keywords, as well as function return types, and to prevent
matches inside strings.
However, the negated set does not contain the `!` comment character,
so a line with an end-of-line comment containing the keyword 'function' or
'subroutine' followed by another word is mistakenly chosen as a hunk header.
Improve the regex by adding `!` to the negated set.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4018')
| -rw-r--r-- | t/t4018/fortran-comment-keyword | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t4018/fortran-comment-keyword b/t/t4018/fortran-comment-keyword index c5dbdb4..e9206a5 100644 --- a/t/t4018/fortran-comment-keyword +++ b/t/t4018/fortran-comment-keyword @@ -8,7 +8,6 @@ real funcB ! grid function b real ChangeMe - integer broken end subroutine RIGHT |