On Wed, Dec 18, 2019 at 07:05:54PM +0100, René Scharfe wrote: > Include an actual function line in the test files to check if context is > expanded to include the whole function, and add an ignored change before > function context to check if that one stays hidden, while the originally > ignored change within function context is shown. > > [...] > 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_write_lines 1 2 3 "" function 1 2 3 4 5 "" 6 7 8 9 >a && > + test_write_lines "" 1 2 3 "" function 1 2 3 4 5 6 7 8 >b && I'm a little mixed on this one. This _is_ a much better test of how the two features should be have together. But I think the reason the original was so short was that it was added when fixing a bug where we'd iterate off the beginning of list of lines, which now no longer happens. Maybe we should cover both cases in two separate tests? I'd also suggest using "a b c" for the first three lines to avoid confusion (I don't think it's important that they're the same as the lines inside the "function"). -Peff
