Don't use FilePathMarshaller when passing Git paths

carlosmn · carlosmn · commit a8e9fc3b93e5 · 2016-04-27T14:29:00.000+02:00
We treat a lot of the data as paths which would be available on the host
system, but this doesn't need to be the case. There are paths which the
filesystem or .NET won't accept which work just fine as paths inside
Git.

This also means the return values are also marshalled as strings, since
we can't assume they contain paths which the path marshaller would
like. It also keeps the separator as the slash rather than convert it
into something which seems native, but is different from what we'd
accept.

The paths which we do refer to as paths inside the workdir are still
marhshalled as paths.
diff --git a/LibGit2Sharp.Tests/IgnoreFixture.cs b/LibGit2Sharp.Tests/IgnoreFixture.cs
@@ -79,8 +79,8 @@ public void CanCheckIfAPathIsIgnoredUsingThePreferedPlatformDirectorySeparatorCh
 
                 Assert.False(repo.Ignore.IsPathIgnored("File.txt"));
                 Assert.True(repo.Ignore.IsPathIgnored("NewFolder"));
-                Assert.True(repo.Ignore.IsPathIgnored(string.Format(@"NewFolder{0}NewFolder", Path.DirectorySeparatorChar)));
-                Assert.True(repo.Ignore.IsPathIgnored(string.Format(@"NewFolder{0}NewFolder{0}File.txt", Path.DirectorySeparatorChar)));
+                Assert.True(repo.Ignore.IsPathIgnored(string.Join("/", "NewFolder", "NewFolder")));
+                Assert.True(repo.Ignore.IsPathIgnored(string.Join("/", "NewFolder", "NewFolder", "File.txt")));
             }
         }
 
@@ -90,21 +90,19 @@ public void HonorDeeplyNestedGitIgnoreFile()
             string path = InitNewRepository();
             using (var repo = new Repository(path))
             {
-                char pd = Path.DirectorySeparatorChar;
-
-                var gitIgnoreFile = string.Format("deeply{0}nested{0}.gitignore", pd);
+                var gitIgnoreFile = string.Join("/", "deeply", "nested", ".gitignore");
                 Touch(repo.Info.WorkingDirectory, gitIgnoreFile, "SmtCounters.h");
 
                 Commands.Stage(repo, gitIgnoreFile);
                 repo.Commit("Add .gitignore", Constants.Signature, Constants.Signature);
 
                 Assert.False(repo.RetrieveStatus().IsDirty);
 
-                var ignoredFile = string.Format("deeply{0}nested{0}SmtCounters.h", pd);
+                var ignoredFile = string.Join("/", "deeply", "nested", "SmtCounters.h");
                 Touch(repo.Info.WorkingDirectory, ignoredFile, "Content");
                 Assert.False(repo.RetrieveStatus().IsDirty);
 
-                var file = string.Format("deeply{0}nested{0}file.txt", pd);
+                var file = string.Join("/", "deeply", "nested", "file.txt");
                 Touch(repo.Info.WorkingDirectory, file, "Yeah!");
 
                 var repositoryStatus = repo.RetrieveStatus();
diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -10,7 +10,7 @@ namespace LibGit2Sharp.Tests
 {
     public class IndexFixture : BaseFixture
     {
-        private static readonly string subBranchFile = Path.Combine("1", "branch_file.txt");
+        private static readonly string subBranchFile = string.Join("/", "1", "branch_file.txt");
         private readonly string[] expectedEntries = new[]
                                                         {
                                                             "1.txt",
@@ -202,7 +202,7 @@ private void InvalidMoveUseCases(string sourcePath, FileStatus sourceStatus, IEn
         public void PathsOfIndexEntriesAreExpressedInNativeFormat()
         {
             // Build relative path
-            string relFilePath = Path.Combine("directory", "Testfile.txt");
+            string relFilePath = Path.Combine("directory", "Testfile.txt").Replace('\\', '/');
 
             string repoPath = InitNewRepository();
 
diff --git a/LibGit2Sharp.Tests/ResetIndexFixture.cs b/LibGit2Sharp.Tests/ResetIndexFixture.cs
@@ -79,7 +79,7 @@ public void CanResetTheIndexToTheContentOfACommitWithCommitAsArgument()
 
                 RepositoryStatus newStatus = repo.RetrieveStatus();
 
-                var expected = new[] { "1.txt", Path.Combine("1", "branch_file.txt"), "deleted_staged_file.txt",
+                var expected = new[] { "1.txt", string.Join("/", "1", "branch_file.txt"), "deleted_staged_file.txt",
                     "deleted_unstaged_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt" };
 
                 Assert.Equal(expected.Length, newStatus.Where(IsStaged).Count());
diff --git a/LibGit2Sharp.Tests/StageFixture.cs b/LibGit2Sharp.Tests/StageFixture.cs
@@ -222,7 +222,7 @@ public void CanStageANewFileWithARelativePathContainingNativeDirectorySeparatorC
 
                 const string posixifiedPath = "Project/a_file.txt";
                 Assert.NotNull(repo.Index[posixifiedPath]);
-                Assert.Equal(file, repo.Index[posixifiedPath].Path);
+                Assert.Equal(posixifiedPath, repo.Index[posixifiedPath].Path);
             }
         }
 
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -268,7 +268,7 @@ public void CanRetrieveTheStatusOfANewRepository(bool includeUnaltered)
         }
 
         [Fact]
-        public void RetrievingTheStatusOfARepositoryReturnNativeFilePaths()
+        public void RetrievingTheStatusOfARepositoryReturnsGitPaths()
         {
             // Build relative path
             string relFilePath = Path.Combine("directory", "Testfile.txt");
@@ -289,7 +289,7 @@ public void RetrievingTheStatusOfARepositoryReturnNativeFilePaths()
                 Assert.Equal(1, repoStatus.Count());
                 StatusEntry statusEntry = repoStatus.Single();
 
-                Assert.Equal(relFilePath, statusEntry.FilePath);
+                Assert.Equal(relFilePath.Replace('\\', '/'), statusEntry.FilePath);
 
                 Assert.Equal(statusEntry.FilePath, repoStatus.Added.Select(s => s.FilePath).Single());
             }
@@ -360,6 +360,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectives()
 
                 RepositoryStatus status = repo.RetrieveStatus();
 
+                relativePath = relativePath.Replace('\\', '/');
                 Assert.Equal(new[] { relativePath, "new_untracked_file.txt" }, status.Untracked.Select(s => s.FilePath));
 
                 Touch(repo.Info.WorkingDirectory, ".gitignore", "*.txt" + Environment.NewLine);
@@ -461,8 +462,6 @@ private static void AssertStatus(bool shouldIgnoreCase, FileStatus expectedFileS
         [Fact]
         public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroughoutDirectories()
         {
-            char dirSep = Path.DirectorySeparatorChar;
-
             string path = SandboxStandardTestRepo();
             using (var repo = new Repository(path))
             {
@@ -476,7 +475,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/what-about-me.txt"));
 
                 RepositoryStatus newStatus = repo.RetrieveStatus();
-                Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
+                Assert.Equal(new[] { "bin/" }, newStatus.Ignored.Select(s => s.FilePath));
 
                 var sb = new StringBuilder();
                 sb.AppendLine("bin/*");
@@ -488,8 +487,8 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
 
                 newStatus = repo.RetrieveStatus();
 
-                Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
-                Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));
+                Assert.Equal(new[] { "bin/look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
+                Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin/what-about-me.txt"));
             }
         }
 
@@ -603,7 +602,7 @@ public void CanIncludeStatusOfUnalteredFiles()
             var path = SandboxStandardTestRepo();
             string[] unalteredPaths = {
                 "1.txt",
-                "1" + Path.DirectorySeparatorChar + "branch_file.txt",
+                "1/branch_file.txt",
                 "branch_file.txt",
                 "new.txt",
                 "README",
diff --git a/LibGit2Sharp.Tests/SubmoduleFixture.cs b/LibGit2Sharp.Tests/SubmoduleFixture.cs
@@ -133,12 +133,10 @@ public void CanEnumerateRepositorySubmodules()
         }
 
         [Theory]
-        [InlineData("sm_changed_head", false)]
-        [InlineData("sm_changed_head", true)]
-        public void CanStageChangeInSubmoduleViaIndexStage(string submodulePath, bool appendPathSeparator)
+        [InlineData("sm_changed_head")]
+        [InlineData("sm_changed_head/")]
+        public void CanStageChangeInSubmoduleViaIndexStage(string submodulePath)
         {
-            submodulePath += appendPathSeparator ? Path.DirectorySeparatorChar : default(char?);
-
             var path = SandboxSubmoduleTestRepo();
             using (var repo = new Repository(path))
             {
@@ -156,12 +154,10 @@ public void CanStageChangeInSubmoduleViaIndexStage(string submodulePath, bool ap
         }
 
         [Theory]
-        [InlineData("sm_changed_head", false)]
-        [InlineData("sm_changed_head", true)]
-        public void CanStageChangeInSubmoduleViaIndexStageWithOtherPaths(string submodulePath, bool appendPathSeparator)
+        [InlineData("sm_changed_head")]
+        [InlineData("sm_changed_head/")]
+        public void CanStageChangeInSubmoduleViaIndexStageWithOtherPaths(string submodulePath)
         {
-            submodulePath += appendPathSeparator ? Path.DirectorySeparatorChar : default(char?);
-
             var path = SandboxSubmoduleTestRepo();
             using (var repo = new Repository(path))
             {
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -103,7 +103,7 @@ internal static extern void giterr_set_str(
         internal static extern unsafe int git_blame_file(
             out git_blame* blame,
             git_repository* repo,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path,
             git_blame_options options);
 
         [DllImport(libgit2)]
@@ -130,7 +130,7 @@ internal delegate int source_callback(
         internal static extern unsafe int git_blob_create_fromstream(
             out IntPtr stream,
             git_repository* repositoryPtr,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath hintpath);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string hintpath);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_blob_create_fromstream_commit(
@@ -141,15 +141,15 @@ internal static extern unsafe int git_blob_create_fromstream_commit(
         internal static extern unsafe int git_blob_create_fromchunks(
             ref GitOid oid,
             git_repository* repositoryPtr,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath hintpath,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string hintpath,
             source_callback fileCallback,
             IntPtr data);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_blob_filtered_content(
             GitBuf buf,
             git_object* blob,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath as_path,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string as_path,
             [MarshalAs(UnmanagedType.Bool)] bool check_for_binary_data);
 
         [DllImport(libgit2)]
@@ -587,9 +587,9 @@ internal unsafe delegate int git_diff_binary_cb(
         [DllImport(libgit2)]
         internal static extern unsafe int git_diff_blobs(
             git_object* oldBlob,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath old_as_path,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string old_as_path,
             git_object* newBlob,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath new_as_path,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string new_as_path,
             GitDiffOptions options,
             git_diff_file_cb fileCallback,
             git_diff_binary_cb binaryCallback,
@@ -672,7 +672,7 @@ internal static extern unsafe int git_ignore_add_rule(
         internal static extern unsafe int git_ignore_path_is_ignored(
             out int ignored,
             git_repository* repo,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_index_add_bypath(
@@ -690,7 +690,7 @@ internal static extern unsafe int git_index_conflict_get(
             out git_index_entry* ours,
             out git_index_entry* theirs,
             git_index* index,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_index_conflict_iterator_new(
@@ -723,7 +723,7 @@ internal static extern unsafe void git_index_conflict_iterator_free(
         [DllImport(libgit2)]
         internal static extern unsafe git_index_entry* git_index_get_bypath(
             git_index* index,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path,
             int stage);
 
         [DllImport(libgit2)]
@@ -748,7 +748,7 @@ internal static extern unsafe int git_index_read(
         [DllImport(libgit2)]
         internal static extern unsafe int git_index_remove_bypath(
             git_index* index,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path);
 
 
         [DllImport(libgit2)]
@@ -760,7 +760,7 @@ internal static extern unsafe int git_index_remove_bypath(
         [DllImport(libgit2)]
         internal static extern unsafe git_index_reuc_entry* git_index_reuc_get_bypath(
             git_index* handle,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_index_write(git_index* index);
@@ -1623,7 +1623,7 @@ internal static extern void git_strarray_free(
         internal static extern unsafe int git_submodule_lookup(
             out git_submodule* reference,
             git_repository* repo,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath name);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_submodule_resolve_url(
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -97,7 +97,7 @@ private static void BuildErrorMessageFromException(StringBuilder sb, int level,
 
         public static unsafe BlameHandle git_blame_file(
             RepositoryHandle repo,
-            FilePath path,
+            string path,
             git_blame_options options)
         {
             git_blame* ptr;
@@ -115,7 +115,7 @@ public static unsafe BlameHandle git_blame_file(
 
         #region git_blob_
 
-        public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, FilePath hintpath)
+        public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, string hintpath)
         {
             IntPtr writestream_ptr;
 
@@ -148,7 +148,7 @@ public static unsafe ObjectId git_blob_create_fromfile(RepositoryHandle repo, Fi
             return oid;
         }
 
-        public static unsafe UnmanagedMemoryStream git_blob_filtered_content_stream(RepositoryHandle repo, ObjectId id, FilePath path, bool check_for_binary_data)
+        public static unsafe UnmanagedMemoryStream git_blob_filtered_content_stream(RepositoryHandle repo, ObjectId id, string path, bool check_for_binary_data)
         {
             var buf = new GitBuf();
             var handle = new ObjectSafeWrapper(id, repo).ObjectPtr;
@@ -1008,7 +1008,7 @@ public static unsafe void git_index_add_bypath(IndexHandle index, FilePath path)
 
         public static unsafe Conflict git_index_conflict_get(
             IndexHandle index,
-            FilePath path)
+            string path)
         {
             git_index_entry* ancestor, ours, theirs;
 
@@ -1073,7 +1073,7 @@ public static unsafe StageLevel git_index_entry_stage(git_index_entry* entry)
             return NativeMethods.git_index_get_byindex(index, n);
         }
 
-        public static unsafe git_index_entry* git_index_get_bypath(IndexHandle index, FilePath path, int stage)
+        public static unsafe git_index_entry* git_index_get_bypath(IndexHandle index, string path, int stage)
         {
             return NativeMethods.git_index_get_bypath(index, path, stage);
         }
@@ -1112,7 +1112,7 @@ public static unsafe void git_index_read(IndexHandle index)
             Ensure.ZeroResult(res);
         }
 
-        public static unsafe void git_index_remove_bypath(IndexHandle index, FilePath path)
+        public static unsafe void git_index_remove_bypath(IndexHandle index, string path)
         {
             int res = NativeMethods.git_index_remove_bypath(index, path);
             Ensure.ZeroResult(res);
@@ -2922,7 +2922,7 @@ public static unsafe int git_status_list_entrycount(StatusListHandle list)
         /// Returns a handle to the corresponding submodule,
         /// or an invalid handle if a submodule is not found.
         /// </summary>
-        public static unsafe SubmoduleHandle git_submodule_lookup(RepositoryHandle repo, FilePath name)
+        public static unsafe SubmoduleHandle git_submodule_lookup(RepositoryHandle repo, string name)
         {
             git_submodule* submodule;
             var res = NativeMethods.git_submodule_lookup(out submodule, repo, name);
diff --git a/LibGit2Sharp/IndexEntry.cs b/LibGit2Sharp/IndexEntry.cs
@@ -47,11 +47,11 @@ internal static unsafe IndexEntry BuildFromPtr(git_index_entry* entry)
                 return null;
             }
 
-            FilePath path = LaxFilePathMarshaler.FromNative(entry->path);
+            string path = LaxUtf8Marshaler.FromNative(entry->path);
 
             return new IndexEntry
             {
-                Path = path.Native,
+                Path = path,
                 Id = new ObjectId(entry->id.Id),
                 StageLevel = Proxy.git_index_entry_stage(entry),
                 Mode = (Mode)entry->mode,
diff --git a/LibGit2Sharp/RepositoryStatus.cs b/LibGit2Sharp/RepositoryStatus.cs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace LibGit2Sharp.Tests`
`10`	`10`	`{`
`11`	`11`	`public class IndexFixture : BaseFixture`
`12`	`12`	`{`
`13`		`- private static readonly string subBranchFile = Path.Combine("1", "branch_file.txt");`
	`13`	`+ private static readonly string subBranchFile = string.Join("/", "1", "branch_file.txt");`
`14`	`14`	`private readonly string[] expectedEntries = new[]`
`15`	`15`	`{`
`16`	`16`	`"1.txt",`
`@@ -202,7 +202,7 @@ private void InvalidMoveUseCases(string sourcePath, FileStatus sourceStatus, IEn`
`202`	`202`	`public void PathsOfIndexEntriesAreExpressedInNativeFormat()`
`203`	`203`	`{`
`204`	`204`	`// Build relative path`
`205`		`- string relFilePath = Path.Combine("directory", "Testfile.txt");`
	`205`	`+ string relFilePath = Path.Combine("directory", "Testfile.txt").Replace('\\', '/');`
`206`	`206`
`207`	`207`	`string repoPath = InitNewRepository();`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public void CanStageANewFileWithARelativePathContainingNativeDirectorySeparatorC`
`222`	`222`
`223`	`223`	`const string posixifiedPath = "Project/a_file.txt";`
`224`	`224`	`Assert.NotNull(repo.Index[posixifiedPath]);`
`225`		`- Assert.Equal(file, repo.Index[posixifiedPath].Path);`
	`225`	`+ Assert.Equal(posixifiedPath, repo.Index[posixifiedPath].Path);`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -133,12 +133,10 @@ public void CanEnumerateRepositorySubmodules()`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`[Theory]`
`136`		`- [InlineData("sm_changed_head", false)]`
`137`		`- [InlineData("sm_changed_head", true)]`
`138`		`- public void CanStageChangeInSubmoduleViaIndexStage(string submodulePath, bool appendPathSeparator)`
	`136`	`+ [InlineData("sm_changed_head")]`
	`137`	`+ [InlineData("sm_changed_head/")]`
	`138`	`+ public void CanStageChangeInSubmoduleViaIndexStage(string submodulePath)`
`139`	`139`	`{`
`140`		`- submodulePath += appendPathSeparator ? Path.DirectorySeparatorChar : default(char?);`
`141`		`-`
`142`	`140`	`var path = SandboxSubmoduleTestRepo();`
`143`	`141`	`using (var repo = new Repository(path))`
`144`	`142`	`{`
`@@ -156,12 +154,10 @@ public void CanStageChangeInSubmoduleViaIndexStage(string submodulePath, bool ap`
`156`	`154`	`}`
`157`	`155`
`158`	`156`	`[Theory]`
`159`		`- [InlineData("sm_changed_head", false)]`
`160`		`- [InlineData("sm_changed_head", true)]`
`161`		`- public void CanStageChangeInSubmoduleViaIndexStageWithOtherPaths(string submodulePath, bool appendPathSeparator)`
	`157`	`+ [InlineData("sm_changed_head")]`
	`158`	`+ [InlineData("sm_changed_head/")]`
	`159`	`+ public void CanStageChangeInSubmoduleViaIndexStageWithOtherPaths(string submodulePath)`
`162`	`160`	`{`
`163`		`- submodulePath += appendPathSeparator ? Path.DirectorySeparatorChar : default(char?);`
`164`		`-`
`165`	`161`	`var path = SandboxSubmoduleTestRepo();`
`166`	`162`	`using (var repo = new Repository(path))`
`167`	`163`	`{`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private static void BuildErrorMessageFromException(StringBuilder sb, int level,`
`97`	`97`
`98`	`98`	`public static unsafe BlameHandle git_blame_file(`
`99`	`99`	`RepositoryHandle repo,`
`100`		`- FilePath path,`
	`100`	`+ string path,`
`101`	`101`	`git_blame_options options)`
`102`	`102`	`{`
`103`	`103`	`git_blame* ptr;`
`@@ -115,7 +115,7 @@ public static unsafe BlameHandle git_blame_file(`
`115`	`115`
`116`	`116`	`#region git_blob_`
`117`	`117`
`118`		`- public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, FilePath hintpath)`
	`118`	`+ public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, string hintpath)`
`119`	`119`	`{`
`120`	`120`	`IntPtr writestream_ptr;`
`121`	`121`
`@@ -148,7 +148,7 @@ public static unsafe ObjectId git_blob_create_fromfile(RepositoryHandle repo, Fi`
`148`	`148`	`return oid;`
`149`	`149`	`}`
`150`	`150`
`151`		`- public static unsafe UnmanagedMemoryStream git_blob_filtered_content_stream(RepositoryHandle repo, ObjectId id, FilePath path, bool check_for_binary_data)`
	`151`	`+ public static unsafe UnmanagedMemoryStream git_blob_filtered_content_stream(RepositoryHandle repo, ObjectId id, string path, bool check_for_binary_data)`
`152`	`152`	`{`
`153`	`153`	`var buf = new GitBuf();`
`154`	`154`	`var handle = new ObjectSafeWrapper(id, repo).ObjectPtr;`
`@@ -1008,7 +1008,7 @@ public static unsafe void git_index_add_bypath(IndexHandle index, FilePath path)`
`1008`	`1008`
`1009`	`1009`	`public static unsafe Conflict git_index_conflict_get(`
`1010`	`1010`	`IndexHandle index,`
`1011`		`- FilePath path)`
	`1011`	`+ string path)`
`1012`	`1012`	`{`
`1013`	`1013`	`git_index_entry* ancestor, ours, theirs;`
`1014`	`1014`
`@@ -1073,7 +1073,7 @@ public static unsafe StageLevel git_index_entry_stage(git_index_entry* entry)`
`1073`	`1073`	`return NativeMethods.git_index_get_byindex(index, n);`
`1074`	`1074`	`}`
`1075`	`1075`
`1076`		`- public static unsafe git_index_entry* git_index_get_bypath(IndexHandle index, FilePath path, int stage)`
	`1076`	`+ public static unsafe git_index_entry* git_index_get_bypath(IndexHandle index, string path, int stage)`
`1077`	`1077`	`{`
`1078`	`1078`	`return NativeMethods.git_index_get_bypath(index, path, stage);`
`1079`	`1079`	`}`
`@@ -1112,7 +1112,7 @@ public static unsafe void git_index_read(IndexHandle index)`
`1112`	`1112`	`Ensure.ZeroResult(res);`
`1113`	`1113`	`}`
`1114`	`1114`
`1115`		`- public static unsafe void git_index_remove_bypath(IndexHandle index, FilePath path)`
	`1115`	`+ public static unsafe void git_index_remove_bypath(IndexHandle index, string path)`
`1116`	`1116`	`{`
`1117`	`1117`	`int res = NativeMethods.git_index_remove_bypath(index, path);`
`1118`	`1118`	`Ensure.ZeroResult(res);`
`@@ -2922,7 +2922,7 @@ public static unsafe int git_status_list_entrycount(StatusListHandle list)`
`2922`	`2922`	`/// Returns a handle to the corresponding submodule,`
`2923`	`2923`	`/// or an invalid handle if a submodule is not found.`
`2924`	`2924`	`/// </summary>`
`2925`		`- public static unsafe SubmoduleHandle git_submodule_lookup(RepositoryHandle repo, FilePath name)`
	`2925`	`+ public static unsafe SubmoduleHandle git_submodule_lookup(RepositoryHandle repo, string name)`
`2926`	`2926`	`{`
`2927`	`2927`	`git_submodule* submodule;`
`2928`	`2928`	`var res = NativeMethods.git_submodule_lookup(out submodule, repo, name);`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@ internal static unsafe IndexEntry BuildFromPtr(git_index_entry* entry)`
`47`	`47`	`return null;`
`48`	`48`	`}`
`49`	`49`
`50`		`- FilePath path = LaxFilePathMarshaler.FromNative(entry->path);`
	`50`	`+ string path = LaxUtf8Marshaler.FromNative(entry->path);`
`51`	`51`
`52`	`52`	`return new IndexEntry`
`53`	`53`	`{`
`54`		`- Path = path.Native,`
	`54`	`+ Path = path,`
`55`	`55`	`Id = new ObjectId(entry->id.Id),`
`56`	`56`	`StageLevel = Proxy.git_index_entry_stage(entry),`
`57`	`57`	`Mode = (Mode)entry->mode,`