From 50325a5fb4efbda0a52d56c71c1b58535d8c5ea6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 20 Apr 2014 21:30:20 +0200 Subject: [PATCH] Fixed issue #2141: libgit2 still added the file with mixing EOL, while autocrlf and safecrlf are true Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum Conflicts: src/Changelog.txt --- ext/libgit2 | 2 +- src/Changelog.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/libgit2 b/ext/libgit2 index 28fd7206b..bfc50f83f 160000 --- a/ext/libgit2 +++ b/ext/libgit2 @@ -1 +1 @@ -Subproject commit 28fd7206b1359b6564bad3c66382b47a8f2e3eb1 +Subproject commit bfc50f83f829afe52c10f615c4f7efa478a83098 diff --git a/src/Changelog.txt b/src/Changelog.txt index a6c9e8c98..32dc597d2 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -12,6 +12,7 @@ Released: Unreleased * Fixed issue #2171: blame setting 'detect moved or copied line' does not work for the case 'from modified files' * Fixed issue #2174: Submodule update shows wrong submodule list * Fixed issue #2175: TortoiseGitBlame fails to search if line has non-ascii chars and system locale is not US + * Fixed issue #2141: libgit2 still added the file with mixing EOL, while autocrlf and safecrlf are true = Release 1.8.8.0 = Released: 2014-04-01 -- 2.11.4.GIT