xdiff: -W: don't include common trailing empty lines in context
Empty lines between functions are shown by diff -W, as it considers them to be part of the function preceding them. They are not interesting in most languages. The previous patch stopped showing them in the special case of a function added at the end of a file. Stop extending context to those empty lines by skipping back over them from the start of the next function. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
May 28, 2016 at 17:03 UTC
9e6a4cfc38aa81055d0b7d6fb94dc7b31809daa9
2 files changed
+4
-2
t/t4051-diff-function-context.sh
+2
-2
@@ -85,7 +85,7 @@ test_expect_success ' context does not include preceding empty lines' '
85
test "$(first_context_line <changed_hello.diff)" != " "
86
'
87
88
-test_expect_failure ' context does not include trailing empty lines' '
88
+test_expect_success ' context does not include trailing empty lines' '
89
test "$(last_context_line <changed_hello.diff)" != " "
90
'
91
@@ -103,7 +103,7 @@ test_expect_success ' context does not include other functions' '
103
test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
104
'
105
106
-test_expect_failure ' context does not include trailing empty lines' '
106
+test_expect_success ' context does not include trailing empty lines' '
107
test "$(last_context_line <changed_includes.diff)" != " "
108
'
109
xdiff/xemit.c
+2
@@ -231,6 +231,8 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
231
long fe1 = get_func_line(xe, xecfg, NULL,
232
xche->i1 + xche->chg1,
233
xe->xdf1.nrec);
234
+ while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1))
235
+ fe1--;
236
if (fe1 < 0)
237
fe1 = xe->xdf1.nrec;
238
if (fe1 > e1) {