development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

xdiff: show non-empty lines before functions with -W

Browse source 
Non-empty lines before a function definition are most likely comments
for that function and thus relevant.  Include them in function context.

Such a non-empty line might also belong to the preceeding function if
there is no separating blank line.  Stop extending the context upwards
also at the next function line to make sure only one extra function body
is shown at most.

Original-patch-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2017-11-18 19:05:19 +01:00 committed by Junio C Hamano
parent cde32bf62f
commit 5c3ed90f3f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t4051-diff-function-context.sh
View file

@ -85,7 +85,7 @@ test_expect_success 'setup' '
check_diff changed_hello 'changed function' check_diff changed_hello 'changed function'
test_expect_failure ' context includes comment' ' test_expect_success ' context includes comment' '
grep "^ .*Hello comment" changed_hello.diff grep "^ .*Hello comment" changed_hello.diff
' '

3
xdiff/xemit.c
View file

@ -204,6 +204,9 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
} }
fs1 = get_func_line(xe, xecfg, NULL, i1, -1); fs1 = get_func_line(xe, xecfg, NULL, i1, -1);
while (fs1 > 0 && !is_empty_rec(&xe->xdf1, fs1 - 1) &&
!is_func_rec(&xe->xdf1, xecfg, fs1 - 1))
fs1--;
if (fs1 < 0) if (fs1 < 0)
fs1 = 0; fs1 = 0;
if (fs1 < s1) { if (fs1 < s1) {