Hi Junio, On Mon, 26 Oct 2015, Junio C Hamano wrote:
> Subject: [PATCH] rebase-i: work around Windows CRLF line endings > > Editors on Windows can and do save text files with CRLF line > endings, which is the convention on the platform. We are seeing > reports that the "read" command in a port of bash to the environment > however does not strip the CRLF at the end, not adjusting for the > same convention on the platform. > > This breaks the recently added sanity checks for the insn sheet fed > to "rebase -i"; instead of an empty line (hence nothing in $command), > the script was getting a lone CR in there. > > Special case a lone CR and treat it the same way as an empty line to > work this around. You do not need me to tell you that it is likely that the same issue will arise in other places, but if you are content with this work-around, so be it. > The test was stolen from Dscho. There was no need to steal this, as I made a specific effort to introduce the test in a separate commit. There was also no need to remove the attribution for finding the bug. Let's not do that. I will submit v3 in a second, including your work-around in favor of the patch you hate so much. Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
