AW: git blame swallows up lines in case of mixed line endings

2015-02-23 Thread Sokolov, Konstantin (ext)
run into consistency problems. -Ursprüngliche Nachricht- Von: Torsten Bögershausen [mailto:tbo...@web.de] Gesendet: Samstag, 21. Februar 2015 14:46 An: Sokolov, Konstantin (ext); 'git@vger.kernel.org' Betreff: Re: git blame swallows up lines in case of mixed line endings On 2015-02-19

Re: git blame swallows up lines in case of mixed line endings

2015-02-23 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 2015-02-19 14.48, Sokolov, Konstantin (ext) wrote: I encounter unexpected behavior in the following case: file content: line1CRLF line2CR line3CRLF line4 You can mark a file as CRLF terminated via attributes system and have Git convert

AW: git blame swallows up lines in case of mixed line endings

2015-02-23 Thread Sokolov, Konstantin (ext)
swallows up lines in case of mixed line endings Torsten Bögershausen tbo...@web.de writes: On 2015-02-19 14.48, Sokolov, Konstantin (ext) wrote: I encounter unexpected behavior in the following case: file content: line1CRLF line2CR line3CRLF line4 You can mark a file as CRLF terminated

Re: AW: git blame swallows up lines in case of mixed line endings

2015-02-23 Thread Junio C Hamano
Sokolov, Konstantin (ext) konstantin.sokolov@siemens.com writes: Thank you for going into the matter. I was not aware of the textconv filter. This is definitely a decent solution. But what exactly do you mean by Even though we have an option to mark CR alone as the end of line marker?

Re: git blame swallows up lines in case of mixed line endings

2015-02-21 Thread Torsten Bögershausen
On 2015-02-19 14.48, Sokolov, Konstantin (ext) wrote: Hi Folks, I encounter unexpected behavior in the following case: file content: line1CRLF line2CR line3CRLF line4 This is what I get as console output (on Windows): git blame -s file.txt 7db36436 1) line1 line3436 2) line2

git blame swallows up lines in case of mixed line endings

2015-02-19 Thread Sokolov, Konstantin (ext)
Hi Folks, I encounter unexpected behavior in the following case: file content: line1CRLF line2CR line3CRLF line4 This is what I get as console output (on Windows): git blame -s file.txt 7db36436 1) line1 line3436 2) line2 7db36436 3) line4 This is the real content: git blame -s file.txt