diff options
author | René Scharfe <l.s.r@web.de> | 2019-12-05 17:15:31 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 09:30:06 -0800 |
commit | 0bb313a5529390276cf5c415891c804dea44fa34 (patch) | |
tree | 51c4771d7f12a0c935e07d581873b00e3c58c93d /builtin/send-pack.c | |
parent | Git 2.23 (diff) | |
download | tgif-0bb313a5529390276cf5c415891c804dea44fa34.tar.xz |
xdiff: unignore changes in function context
Changes involving only blank lines are hidden with --ignore-blank-lines,
unless they appear in the context lines of other changes. This is
handled by xdl_get_hunk() for context added by --inter-hunk-context, -u
and -U.
Function context for -W and --function-context added by xdl_emit_diff()
doesn't pay attention to such ignored changes; it relies fully on
xdl_get_hunk() and shows just the post-image of ignored changes
appearing in function context. That's inconsistent and confusing.
Improve the result of using --ignore-blank-lines and --function-context
together by fully showing ignored changes if they happen to fall within
function context.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/send-pack.c')
0 files changed, 0 insertions, 0 deletions