"Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > +test_expect_success 'colors can be skipped with color.ui=false' ' > + git reset --hard && > + test_when_finished "git rm -f color-test" && > + test_write_lines context old more-context >color-test && > + git add color-test && > + test_write_lines context new more-context another-one >color-test && > + > + test_write_lines help quit >input && > + force_color git \ > + -c color.ui=false \ > + add -i >actual.raw <input && > + test_decode_color <actual.raw >actual && It is a minor thing, but for expected output that _wants_ to be indented in a non-standard way, it would be prudent to protect the lines from "git apply --whitespace=fix" and in-transit corruption, perhaps doing something like ... > + cat >expect <<-\EOF && > + staged unstaged path > + 1: +3/-0 +2/-1 color-test > + > + *** Commands *** ... this. sed -e "s/^|//" >expect <<-\EOF && | staged unstaged path | 1: +3/-0 +2/-1 color-test | |*** Commands *** Although this patch does not add such lines, the same principle applies to expected output lines that _wants_ to have trailing whitespaces. Thanks.