diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-17 00:08:32 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-17 00:08:32 +0300 |
commit | f0070a7df98540ebd0ba6ecb7aef4620efe27724 (patch) | |
tree | 7709292d94464899030197ae1b412c3a4734d0b2 /t | |
parent | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 (diff) | |
parent | 0bb313a5529390276cf5c415891c804dea44fa34 (diff) |
Merge branch 'rs/xdiff-ignore-ws-w-func-context'
The "diff" machinery learned not to lose added/removed blank lines
in the context when --ignore-blank-lines and --function-context are
used at the same time.
* rs/xdiff-ignore-ws-w-func-context:
xdiff: unignore changes in function context
Diffstat (limited to 't')
-rwxr-xr-x | t/t4015-diff-whitespace.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 4c540b1d70..65615e2fa9 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -2050,11 +2050,6 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' ' test_cmp expected actual ' -# Note that the "6" in the expected hunk header below is funny, since we only -# show 5 lines (the missing one was blank and thus ignored). This is how -# --ignore-blank-lines behaves even without --function-context, and this test -# is just checking the interaction of the two features. Don't take it as an -# endorsement of that output. test_expect_success 'combine --ignore-blank-lines with --function-context' ' test_write_lines 1 "" 2 3 4 5 >a && test_write_lines 1 2 3 4 >b && @@ -2064,6 +2059,7 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' ' cat <<-\EOF >expect && @@ -1,6 +1,4 @@ 1 + - 2 3 4 |