Cosmetic tweaks to improve error messages

GitTools · May 22, 2020 · d7889a4 · d7889a4
1 parent 8921bf6
commit d7889a4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs
@@ -391,7 +391,7 @@ public void WorkingDirectoryWithoutGit()
                 var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
                 gitVersionCalculator.CalculateVersionVariables();
             });
-            exception.Message.ShouldContain("Can't find the .git directory in");
+            exception.Message.ShouldContain("Cannot find the .git directory");
         }
 
         [Test]

diff --git a/src/GitVersionCore/Extensions/GitVersionOptionsExtensions.cs b/src/GitVersionCore/Extensions/GitVersionOptionsExtensions.cs
@@ -15,7 +15,7 @@ public static string GetDotGitDirectory(this GitVersionOptions gitVersionOptions
 
             dotGitDirectory = dotGitDirectory?.TrimEnd('/', '\\');
             if (string.IsNullOrEmpty(dotGitDirectory))
-                throw new DirectoryNotFoundException($"Can't find the .git directory in {dotGitDirectory}");
+                throw new DirectoryNotFoundException("Cannot find the .git directory");
 
             return dotGitDirectory.Contains(Path.Combine(".git", "worktrees"))
                 ? Directory.GetParent(Directory.GetParent(dotGitDirectory).FullName).FullName
@@ -32,7 +32,7 @@ public static string GetProjectRootDirectory(this GitVersionOptions gitVersionOp
             var dotGitDirectory = Repository.Discover(gitVersionOptions.WorkingDirectory);
 
             if (string.IsNullOrEmpty(dotGitDirectory))
-                throw new DirectoryNotFoundException($"Can't find the .git directory in {dotGitDirectory}");
+                throw new DirectoryNotFoundException("Cannot find the .git directory");
 
             using var repository = new Repository(dotGitDirectory);
             return repository.Info.WorkingDirectory;

diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
@@ -33,7 +33,7 @@ public override IEnumerable<BaseVersion> GetVersions()
             }
             catch (NotFoundException exception)
             {
-                throw new GitVersionException($"Can't find commit {currentBranchTip.Sha}. Please ensure that the repository is an unshallow clone with `git fetch --unshallow`.", exception);
+                throw new GitVersionException($"Cannot find commit {currentBranchTip.Sha}. Please ensure that the repository is an unshallow clone with `git fetch --unshallow`.", exception);
             }
 
             yield return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), baseVersionSource, null);

diff --git a/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs b/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs
@@ -77,7 +77,7 @@ public void WorkingDirectoryWithoutGitFolderFailsWithInformativeMessage()
             var result = GitVersionHelper.ExecuteIn(Environment.SystemDirectory, arguments: null, logToFile: false);
 
             result.ExitCode.ShouldNotBe(0);
-            result.Output.ShouldContain("Can't find the .git directory in");
+            result.Output.ShouldContain("Cannot find the .git directory");
         }
 
         [Test]