All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Sokolov, Konstantin (ext)" <konstantin.sokolov.ext@siemens.com>
To: "'git@vger.kernel.org'" <git@vger.kernel.org>
Subject: git blame swallows up lines in case of mixed line endings
Date: Thu, 19 Feb 2015 13:48:03 +0000	[thread overview]
Message-ID: <71BF70CE41AEE741896AF3A5450D86F11F2D1F46@DEFTHW99EH3MSX.ww902.siemens.net> (raw)

Hi Folks,

I encounter unexpected behavior in the following case:

file content:

line1<CR><LF>
line2<CR>
line3<CR><LF>
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 > blame.txt

blame.txt opened in Notepad++:

7db36436 1) line1 <CR><LF>
7db36436 2) line2 <CR>
line3 <CR><LF>
7db36436 3) line4 <LF>

Admittedly, very stupid editors, such as Windows Notepad, cannot handle mixed line endings as well. But is this also the way git blame should behave?

Kind regards
Konstantin

             reply	other threads:[~2015-02-19 14:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-19 13:48 Sokolov, Konstantin (ext) [this message]
2015-02-21 13:45 ` git blame swallows up lines in case of mixed line endings Torsten Bögershausen
2015-02-23 11:50   ` AW: " Sokolov, Konstantin (ext)
2015-02-23 18:44   ` Junio C Hamano
2015-02-23 19:09     ` AW: " Sokolov, Konstantin (ext)
2015-02-23 20:27       ` Junio C Hamano

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=71BF70CE41AEE741896AF3A5450D86F11F2D1F46@DEFTHW99EH3MSX.ww902.siemens.net \
    --to=konstantin.sokolov.ext@siemens.com \
    --cc=git@vger.kernel.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.