Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Johannes Schindelin [off-list ref] writes:

I finally have that test case working, took way longer than I wanted to:

This certainly fails without any fix and passes either with your
two-patch or a more conservative run_command() fix that I sent
separately.

However, this new test (becomes 5520.20) seems to break the
precondition of some later tests---I didn't dig but 5520.22 (which
used to be .21) fails after letting this new test run and succeed.

I think there is more than one fix necessary to truly address the
issue: the underlying problem is that Git handles *committed*
CR/LF really badly when the corresponding `.gitattributes` label
the file as `text=auto`.

Yeah, that certainly is the right thing to tackle.