Re: Diff colorizer confused by dos newlines

2013-07-09 Thread Jeff King 
On Tue, Jul 09, 2013 at 02:28:32PM -0400, Phillip Susi wrote:

 When I try to look at a color diff of a file using dos newlines, the
 output gets an odd sequence of ansi escapes and a stray carriage
 return showing up only on the + lines, but not the -.  The normal
 looking - lines look like this:
 
 \r\n ( from previous line ), ansi color escape, '-', whitespace, text,
 terminating ansi escpae ( [m ), \r\n.
 
 The broken + lines look like this:
 
 \r\n ( from previous line ), ansi color sequence, '+', terminating
 ansi escape ( [m ), whitespace, ansi color sequence, text, terminating
 ansi escape, ansi color sequence, stray \r, terminating ansi escape, \n.

That's intentional; the added lines go through the whitespace checker
to help you identify potential whitespace problems (there is not much
point showing them on lines going away, since you are getting rid of
them).

 Any suggestions on how to resolve this?

Try:

  git config core.whitespace cr-at-eol

See the description of core.whitespace in git help config for more
details.

-Peff
--
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

Re: Diff colorizer confused by dos newlines

2013-07-09 Thread Phillip Susi 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Of course!  Thanks, now it completely makes sense.

On 07/09/2013 03:41 PM, Jeff King wrote:
 On Tue, Jul 09, 2013 at 02:28:32PM -0400, Phillip Susi wrote:
 
 When I try to look at a color diff of a file using dos newlines,
 the output gets an odd sequence of ansi escapes and a stray
 carriage return showing up only on the + lines, but not the -.
 The normal looking - lines look like this:
 
 \r\n ( from previous line ), ansi color escape, '-', whitespace,
 text, terminating ansi escpae ( [m ), \r\n.
 
 The broken + lines look like this:
 
 \r\n ( from previous line ), ansi color sequence, '+',
 terminating ansi escape ( [m ), whitespace, ansi color sequence,
 text, terminating ansi escape, ansi color sequence, stray \r,
 terminating ansi escape, \n.
 
 That's intentional; the added lines go through the whitespace
 checker to help you identify potential whitespace problems (there
 is not much point showing them on lines going away, since you are
 getting rid of them).
 
 Any suggestions on how to resolve this?
 
 Try:
 
 git config core.whitespace cr-at-eol
 
 See the description of core.whitespace in git help config for
 more details.
 
 -Peff
 

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJR3J5IAAoJEJrBOlT6nu757gIIAMx+w7oCXZt66z57VhZi2yl0
PmL1HKGQ9+aqerwBtcOFvQL+b8s8o0nLUg3jkHWUFLdEtTIsLSlEwyJBhCzbWQQh
NzzuwtzGdoXWxj8lFf1PakLRpWg0IW0QJ6WuMltEZMvPvF4jyt3yCArS0StpZEG/
PhQoEsgg8XjgvP6KIpZDc/CoElKn0fyWf0HlLFwV+k+cCgQM+y7POnGdzGwKIM+O
U5QJxWZmNFuznJHxkd+YWIsAZuHS/eH4Tz97/Abl9z30k+/4eHvD/Hd47RCTLrC1
90IiBKp9vvPWJHA+6c1WTwiTnn54CpudKstB499aaMRsvXBzXHcdD+Tkb38imwI=
=WMkZ
-END PGP SIGNATURE-
--
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