autodetect CR so test is robust to Git's line ending swizzling
work on optimizations involving let-variables
whitespace change (again???)

this part of git is really annoying!
I also added IGNORABLE queries