Merge pull request #921 from github-for-unity/strange-file-names

Handling file names that look like they are a drive letter

Author: StanleyGoldman

src/GitHub.Api/IO/NiceIO.cs

@@ -113,7 +113,7 @@ private static bool HasNonDotDotLastElement(List<string> stack)
 
         private static string ParseDriveLetter(string path, out string driveLetter)
         {
-            if (path.Length >= 2 && path[1] == ':')
+            if (path.Length >= 3 && path[1] == ':' && (path[2] == '/' || path[2] == '\\'))
             {
                 driveLetter = path[0].ToString();
                 return path.Substring(2);

src/tests/UnitTests/IO/GitObjectFactoryTests.cs

@@ -0,0 +1,50 @@
+using GitHub.Unity;
+using NCrunch.Framework;
+using NSubstitute;
+using NUnit.Framework;
+using TestUtils;
+
+namespace UnitTests
+{
+    [TestFixture, Isolated]
+    class GitObjectFactoryTests
+    {
+        private static readonly SubstituteFactory SubstituteFactory = new SubstituteFactory();
+
+        [Test]
+        public void ShouldParseNormalFile()
+        {
+            NPath.FileSystem = SubstituteFactory.CreateFileSystem(new CreateFileSystemOptions() {
+                CurrentDirectory = @"c:\Projects\UnityProject"
+            });
+
+            var environment = Substitute.For<IEnvironment>();
+            environment.RepositoryPath.Returns(@"c:\Projects\UnityProject".ToNPath());
+            environment.UnityProjectPath.Returns(@"c:\Projects\UnityProject".ToNPath());
+
+            var gitObjectFactory = new GitObjectFactory(environment);
+            var gitStatusEntry = gitObjectFactory.CreateGitStatusEntry("hello.txt", GitFileStatus.Deleted);
+
+            Assert.AreEqual(@"c:\Projects\UnityProject\hello.txt", gitStatusEntry.FullPath);
+        }
+
+
+        [Test]
+        public void ShouldParseOddFile()
+        {
+            NPath.FileSystem = SubstituteFactory.CreateFileSystem(new CreateFileSystemOptions()
+            {
+                CurrentDirectory = @"c:\Projects\UnityProject"
+            });
+
+            var environment = Substitute.For<IEnvironment>();
+            environment.RepositoryPath.Returns(@"c:\Projects\UnityProject".ToNPath());
+            environment.UnityProjectPath.Returns(@"c:\Projects\UnityProject".ToNPath());
+
+            var gitObjectFactory = new GitObjectFactory(environment);
+            var gitStatusEntry = gitObjectFactory.CreateGitStatusEntry("c:UsersOculusGoVideo.mp4", GitFileStatus.Deleted);
+
+            Assert.AreEqual(@"c:\Projects\UnityProject\c:UsersOculusGoVideo.mp4", gitStatusEntry.FullPath);
+        }
+    }
+}

src/tests/UnitTests/UnitTests.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Git\GitConfigTests.cs" />
     <Compile Include="IO\BranchListOutputProcessorTests.cs" />
     <Compile Include="Extensions\EnvironmentExtensionTests.cs" />
+    <Compile Include="IO\GitObjectFactoryTests.cs" />
     <Compile Include="IO\LfsVersionOutputProcessorTests.cs" />
     <Compile Include="IO\LinuxDiskUsageOutputProcessorTests.cs" />
     <Compile Include="IO\LockOutputProcessorTests.cs" />