Re: [BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

From: Jeff King <peff@peff.net>
Date: Mar 30, 2017, 20:00 UTC
Message-ID: <20170330200021.c2l5jak3xb5aoxyc@sigill.intra.peff.net>
In-Reply-To: <feaeade7-aeb5-fa67-ab29-9106aeadb2a6@gmail.com>

On Thu, Mar 30, 2017 at 09:35:27PM +0200, Jakub Narębski wrote:

Show 18 quoted lines

> And everything would be all right... if not the fact that Git appends
> spurious ^M to added lines in the `git diff` output.  Files use CRLF
> end-of-line convention (the native MS Windows one).
> 
>   $ git diff test.tex
>   diff --git a/test.tex b/test.tex
>   index 029646e..250ab16 100644
>   --- a/test.tex
>   +++ b/test.tex
>   @@ -1,4 +1,4 @@
>   -\documentclass{article}
>   +\documentclass{mwart}^M
>   
>    \usepackage[cp1250]{inputenc}
>    \usepackage{polski}
> 
> What gives?  Why there is this ^M tacked on the end of added lines,
> while it is not present in deleted lines, nor in content lines?

Perhaps it's trailing whitespace highlighting for added lines? You can add "cr-at-eol" to core.whitespace to suppress it.

I suspect in the normal case that git is doing line-ending conversion, but it's suppressed when textconv is in use.

-Peff