All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
To: git@vger.kernel.org
Cc: Johannes Sixt <j6t@kdbg.org>
Subject: Re: Bug: Problem with CRLF line ending in git-diff with coloring
Date: Fri, 14 Feb 2014 17:47:09 +0100	[thread overview]
Message-ID: <20140214164709.GI7560@pille.home> (raw)
In-Reply-To: <20140209110155.GB16189@scotty.home>

[-- Attachment #1: Type: text/plain, Size: 836 bytes --]

Mail von Stefan-W. Hahn, Sun, 09 Feb 2014 at 12:01:55 +0100:

Good afternoon,

I updated the test a little bit. Test 3 and 7 are going wrong.
Both tests have a CRLF line ending in the changed line.

I you redirect the output of the test to a file you see the main
problem:

,----
| -^[[32m+^[[m^[[32mZeile 22^[[m^[[32m\r^[[m
| +^[[32m+^[[m^[[32mZeile 22^[[m^[[41m\r^[[m
`----

> It's the right solution. IOW, you should place something like this in
> your .gitattributes:
>  *.html whitespace=cr-at-eol

Sorry, but this is not possible, because I have files of both sorts (mainly
C/C++) files in my repository and cannot change the files as I wish.

With kind regards,
Stefan

-- 
Stefan-W. Hahn                          It is easy to make things.
                                        It is hard to make things simple.

[-- Attachment #2: t4060-diff-eol.sh --]
[-- Type: application/x-sh, Size: 4199 bytes --]

  parent reply	other threads:[~2014-02-14 16:51 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-09 11:01 Bug: Problem with CRLF line ending in git-diff with coloring Stefan-W. Hahn
2014-02-09 18:30 ` Johannes Sixt
2014-02-14 16:47 ` Stefan-W. Hahn [this message]
2014-02-14 21:19   ` Johannes Sixt
2014-02-15  7:21     ` Stefan-W. Hahn
2014-02-14 21:17 ` Stefan-W. Hahn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140214164709.GI7560@pille.home \
    --to=stefan.hahn@s-hahn.de \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.