From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: "Benkstein, Frank" <frank.benkstein@sap.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git blame breaking on repository with CRLF files
Date: Mon, 10 Aug 2015 23:54:03 +0000 [thread overview]
Message-ID: <20150810235403.GC9420@vauxhall.crustytoothpaste.net> (raw)
In-Reply-To: <B0BFE3BB9B3E8C4A890D53FA460552D373734199@DEWDFEMB16B.global.corp.sap>
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
On Mon, Aug 10, 2015 at 08:36:35AM +0000, Benkstein, Frank wrote:
> You are correct that it is also wrong in git v1.7.0. However, it is correct in
> v2.4.0.
>
> Another bisect gave me this commit which was included in v2.0.1:
>
> commit 4d4813a52f3722854a54bab046f4abfec13ef6ae
> Author: brian m. carlson <sandals@crustytoothpaste.net>
> Date: Sat Apr 26 23:10:40 2014 +0000
>
> blame: correctly handle files regardless of autocrlf
>
> So this still looks like a regression v2.5.0 to me.
This commit was reverted because it was decided that it wasn't the right
way to handle the problem and it broke other things. The complexity of
the CRLF handling is a bit beyond me, to be honest. I'm sure I'd
understand it better if I used it more, but I'm a Unix guy.
I stand by my earlier statement that we should improve the documentation
in this area, because it's a common source of confusion.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 835 bytes --]
next prev parent reply other threads:[~2015-08-10 23:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-07 16:32 git blame breaking on repository with CRLF files Benkstein, Frank
2015-08-08 5:58 ` Torsten Bögershausen
2015-08-09 20:19 ` Torsten Bögershausen
2015-08-10 8:36 ` Benkstein, Frank
2015-08-10 23:54 ` brian m. carlson [this message]
2015-08-10 18:48 ` Junio C Hamano
2015-08-10 20:22 ` Torsten Bögershausen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150810235403.GC9420@vauxhall.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=frank.benkstein@sap.com \
--cc=git@vger.kernel.org \
--cc=tboegi@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).