diff options
| author | René Scharfe <l.s.r@web.de> | 2016-05-28 17:03:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-31 13:08:56 -0700 |
| commit | 9e6a4cfc38aa81055d0b7d6fb94dc7b31809daa9 (patch) | |
| tree | e03053b418d6223b8fa33714e43037e5ba7524b5 /xdiff | |
| parent | 392f6d316623e8ecd6210248ba9ae2cabf07352b (diff) | |
| download | git-9e6a4cfc38aa81055d0b7d6fb94dc7b31809daa9.tar.gz git-9e6a4cfc38aa81055d0b7d6fb94dc7b31809daa9.tar.xz | |
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>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xemit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 29cec1259..bfa53d3dc 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -231,6 +231,8 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, long fe1 = get_func_line(xe, xecfg, NULL, xche->i1 + xche->chg1, xe->xdf1.nrec); + while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1)) + fe1--; if (fe1 < 0) fe1 = xe->xdf1.nrec; if (fe1 > e1) { |