From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Nov 2017 04:41:50 +0000 (+0900)
Subject: Merge branch 'rs/include-comments-before-the-function-header'
X-Git-Tag: v2.16.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f03490164811f19c8d2222a658398d67b14e905d

Merge branch 'rs/include-comments-before-the-function-header'

"git grep -W", "git diff -W" and their friends learned a heuristic
to extend a pre-context beyond the line that matches the "function
pattern" (aka "diff.*.xfuncname") to include a comment block, if
exists, that immediately precedes it.

* rs/include-comments-before-the-function-header:
grep: show non-empty lines before functions with -W
grep: update boundary variable for pre-context
t7810: improve check of -W with user-defined function lines
xdiff: show non-empty lines before functions with -W
xdiff: factor out is_func_rec()
t4051: add test for comments preceding function lines
---

f03490164811f19c8d2222a658398d67b14e905d