diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-08-09 15:18:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-09 15:18:18 -0700 |
| commit | ae76814c6ca1af63f947c3525dfd1a799c3d9fd4 (patch) | |
| tree | 1b37970c2a541ad4550465061efc718e83e5e354 /t | |
| parent | RelNotes/2.21.1: typofix (diff) | |
| parent | xdiff: clamp function context indices in post-image (diff) | |
| download | tgif-ae76814c6ca1af63f947c3525dfd1a799c3d9fd4.tar.xz | |
Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint
The internal diff machinery can be made to read out of bounds while
looking for --funcion-context line in a corner case, which has been
corrected.
* jk/xdiff-clamp-funcname-context-index:
xdiff: clamp function context indices in post-image
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index ab4670d236..6b087df3dc 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -2008,4 +2008,26 @@ 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 && + test_must_fail git diff --no-index \ + --ignore-blank-lines --function-context a b >actual.raw && + sed -n "/@@/,\$p" <actual.raw >actual && + cat <<-\EOF >expect && + @@ -1,6 +1,4 @@ + 1 + 2 + 3 + 4 + -5 + EOF + test_cmp expect actual +' + test_done |