diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-28 13:41:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-28 13:41:50 +0900 |
| commit | f03490164811f19c8d2222a658398d67b14e905d (patch) | |
| tree | 0427ffa7fee9b19daeb2bf0c92986a27ea9724d2 /t/t4051-diff-function-context.sh | |
| parent | 3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3 (diff) | |
| parent | a5dc20b0701cee53b2c37a4aa3a339b48d5bb298 (diff) | |
| download | git-f03490164811f19c8d2222a658398d67b14e905d.tar.gz | |
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
Diffstat (limited to 't/t4051-diff-function-context.sh')
| -rwxr-xr-x | t/t4051-diff-function-context.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh index 3e6b485ecb..2d76a971c4 100755 --- a/t/t4051-diff-function-context.sh +++ b/t/t4051-diff-function-context.sh @@ -85,6 +85,10 @@ test_expect_success 'setup' ' check_diff changed_hello 'changed function' +test_expect_success ' context includes comment' ' + grep "^ .*Hello comment" changed_hello.diff +' + test_expect_success ' context includes begin' ' grep "^ .*Begin of hello" changed_hello.diff ' |