Trim trailing whitespace in .git file

dotnet · Jul 1, 2019 · 0b9f733 · 0b9f733
1 parent a975b6d
commit 0b9f733
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 62 deletions.
diff --git a/src/Microsoft.Build.Tasks.Git.UnitTests/GitRepositoryTests.cs b/src/Microsoft.Build.Tasks.Git.UnitTests/GitRepositoryTests.cs
@@ -213,8 +213,9 @@ public void Submodules_Errors()
             workingDir.CreateDirectory("sub6").CreateDirectory(".git");
             workingDir.CreateDirectory("sub7").CreateFile(".git").WriteAllText("xyz");
             workingDir.CreateDirectory("sub8").CreateFile(".git").WriteAllText("gitdir: \0<>");
-            workingDir.CreateDirectory("sub9").CreateFile(".git").WriteAllText("gitdir: ../.git/modules/sub9");
+            workingDir.CreateDirectory("sub9").CreateFile(".git").WriteAllText("gitdir: ../.git/modules/sub9\r\n");
             workingDir.CreateDirectory("sub10").CreateFile(".git").WriteAllText("gitdir: ../.git/modules/sub10");
+            workingDir.CreateDirectory("sub11").CreateFile(".git").WriteAllText("gitdir: ../.git/modules/sub11 \t\v\r\n");
 
             workingDir.CreateFile(".gitmodules").WriteAllText(@"
 [submodule ""S1""]             # whitespace-only path
@@ -260,13 +261,18 @@ public void Submodules_Errors()
 [submodule ""S10""]            # sub10/.git points to directory that has commondir directory (it should be a file)
   path = sub10
   url = http://github.com
+
+[submodule ""S11""]            # trailing whitespace in path
+  path = sub11
+  url = http://github.com
 ");
             var repository = new GitRepository(GitEnvironment.Empty, GitConfig.Empty, gitDir.Path, gitDir.Path, workingDir.Path);
 
             var submodules = repository.GetSubmodules();
             AssertEx.Equal(new[]
             {
                 "S10: 'sub10' 'http://github.com'",
+                "S11: 'sub11' 'http://github.com'",
                 "S9: 'sub9' 'http://github.com'"
             }, submodules.Select(s => $"{s.Name}: '{s.WorkingDirectoryRelativePath}' '{s.Url}'"));
 
@@ -288,7 +294,7 @@ public void Submodules_Errors()
               // The format of the file 'sub7\.git' is invalid.
               string.Format(Resources.FormatOfFileIsInvalid, Path.Combine(workingDir.Path, "sub7", ".git")),
               // Path specified in file 'sub8\.git' is invalid.
-              string.Format(Resources.PathSpecifiedInFileIsInvalid, Path.Combine(workingDir.Path, "sub8", ".git"))
+              string.Format(Resources.PathSpecifiedInFileIsInvalid, Path.Combine(workingDir.Path, "sub8", ".git"), "\0<>")
             }, diagnostics);
         }
 
@@ -363,7 +369,7 @@ public void GetSubmoduleHeadCommitSha()
             var submoduleGitDir = temp.CreateDirectory();
 
             var submoduleWorkingDir = workingDir.CreateDirectory("sub").CreateDirectory("abc");
-            submoduleWorkingDir.CreateFile(".git").WriteAllText("gitdir: " + submoduleGitDir.Path);
+            submoduleWorkingDir.CreateFile(".git").WriteAllText("gitdir: " + submoduleGitDir.Path + "\t \v\f\r\n\n\r");
 
             var submoduleRefsHeadsDir = submoduleGitDir.CreateDirectory("refs").CreateDirectory("heads");
             submoduleRefsHeadsDir.CreateFile("master").WriteAllText("0000000000000000000000000000000000000000");

diff --git a/src/Microsoft.Build.Tasks.Git/GitDataReader/GitRepository.cs b/src/Microsoft.Build.Tasks.Git/GitDataReader/GitRepository.cs
@@ -174,7 +174,7 @@ internal static string GetWorkingDirectory(GitConfig config, string gitDirectory
                 // Path in gitdir file must be absolute.
                 if (!PathUtils.IsAbsolute(workingDirectory))
                 {
-                    throw new InvalidDataException(string.Format(Resources.PathSpecifiedInFileIsNotAbsolute, gitdirFilePath));
+                    throw new InvalidDataException(string.Format(Resources.PathSpecifiedInFileIsNotAbsolute, gitdirFilePath, workingDirectory));
                 }
 
                 try
@@ -183,7 +183,7 @@ internal static string GetWorkingDirectory(GitConfig config, string gitDirectory
                 }
                 catch
                 {
-                    throw new InvalidDataException(string.Format(Resources.PathSpecifiedInFileIsInvalid, gitdirFilePath));
+                    throw new InvalidDataException(string.Format(Resources.PathSpecifiedInFileIsInvalid, gitdirFilePath, workingDirectory));
                 }
             }
 
@@ -533,8 +533,7 @@ private static string ReadDotGitFile(string path)
                 throw new InvalidDataException(string.Format(Resources.FormatOfFileIsInvalid, path));
             }
 
-            // git does not trim whitespace:
-            var link = content.Substring(GitDirPrefix.Length);
+            var link = content.Substring(GitDirPrefix.Length).TrimEnd(CharUtils.AsciiWhitespace);
 
             try
             {
@@ -543,7 +542,7 @@ private static string ReadDotGitFile(string path)
             }
             catch
             {
-                throw new InvalidDataException(string.Format(Resources.PathSpecifiedInFileIsInvalid, path));
+                throw new InvalidDataException(string.Format(Resources.PathSpecifiedInFileIsInvalid, path, link));
             }
         }
 

diff --git a/src/Microsoft.Build.Tasks.Git/Resources.resx b/src/Microsoft.Build.Tasks.Git/Resources.resx
@@ -130,10 +130,10 @@
     <value>Unsupported repository version {0}. Only versions up to {1} are supported.</value>
   </data>
   <data name="PathSpecifiedInFileIsNotAbsolute" xml:space="preserve">
-    <value>Path specified in file '{0}' is not absolute.</value>
+    <value>Path specified in file '{0}' is not absolute: '{1}'.</value>
   </data>
   <data name="PathSpecifiedInFileIsInvalid" xml:space="preserve">
-    <value>Path specified in file '{0}' is invalid.</value>
+    <value>Path specified in file '{0}' is invalid: '{1}'</value>
   </data>
   <data name="ValueOfIsNotValidPath" xml:space="preserve">
     <value>The value of {0} is not a valid path: '{1}'.</value>

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.cs.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.cs.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.de.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.de.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.es.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.es.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.fr.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.fr.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.it.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.it.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.ja.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.ja.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.ko.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.ko.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.pl.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.pl.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.pt-BR.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.pt-BR.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.ru.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.ru.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.tr.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.tr.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.zh-Hans.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.zh-Hans.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">

diff --git a/src/Microsoft.Build.Tasks.Git/xlf/Resources.zh-Hant.xlf b/src/Microsoft.Build.Tasks.Git/xlf/Resources.zh-Hant.xlf
@@ -63,13 +63,13 @@
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsInvalid">
-        <source>Path specified in file '{0}' is invalid.</source>
-        <target state="new">Path specified in file '{0}' is invalid.</target>
+        <source>Path specified in file '{0}' is invalid: '{1}'</source>
+        <target state="new">Path specified in file '{0}' is invalid: '{1}'</target>
         <note />
       </trans-unit>
       <trans-unit id="PathSpecifiedInFileIsNotAbsolute">
-        <source>Path specified in file '{0}' is not absolute.</source>
-        <target state="new">Path specified in file '{0}' is not absolute.</target>
+        <source>Path specified in file '{0}' is not absolute: '{1}'.</source>
+        <target state="new">Path specified in file '{0}' is not absolute: '{1}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="RecursionDetectedWhileResolvingReference">