From 93b6835c139e7bbc3f8be9bd54ab57e31b1ab1d7 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 27 Jul 2017 10:49:07 +0100 Subject: [PATCH 1/2] foo --- .gitattributes | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9d132e955..169ab48f4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,3 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp +# Auto detect text files and perform LF normalization +* binary + From d96bfe67791f09c7ae1ed58df23382960e21b8c0 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sun, 30 Jul 2017 15:25:47 +0100 Subject: [PATCH 2/2] NativeMethods: take strings for `git_rebase_commit` --- LibGit2Sharp/Core/NativeMethods.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs index b3e7f1297..469e55773 100644 --- a/LibGit2Sharp/Core/NativeMethods.cs +++ b/LibGit2Sharp/Core/NativeMethods.cs @@ -213,8 +213,8 @@ internal static extern unsafe int git_rebase_commit( git_rebase* rebase, git_signature* author, git_signature* committer, - IntPtr message_encoding, - IntPtr message); + [CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* message_encoding, + [CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* message); [DllImport(libgit2)] internal static extern unsafe int git_rebase_abort(