Modified the initial boolean RepositoryDirtyFlag to be an integer returning the count of UncommittedChanges

pysco68 · pysco68 · commit 526caf9044fc · 2020-10-23T09:55:08.000+02:00
diff --git a/docs/input/docs/more-info/variables.md b/docs/input/docs/more-info/variables.md
@@ -40,7 +40,7 @@ Running `GitVersion.exe` in your repo will show you what is available. For the
   "CommitsSinceVersionSource":1,
   "CommitsSinceVersionSourcePadded":"0001",
   "CommitDate":"2014-03-06",
-  "RepositoryDirtyFlag": ""
+  "UncommittedChanges": 0
 }
 ```
 
diff --git a/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs
@@ -148,7 +148,7 @@ public void CacheFileExistsOnDisk()
         CommitsSinceVersionSource: 19
         CommitsSinceVersionSourcePadded: 0019
         CommitDate: 2015-11-10
-        RepositoryDirtyFlag: 
+        UncommittedChanges: 0
         ";
 
             var stringBuilder = new StringBuilder();
@@ -209,6 +209,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         CommitsSinceVersionSource: 19
         CommitsSinceVersionSourcePadded: 0019
         CommitDate: 2015-11-10
+        UncommittedChanges: 0
         ";
 
             using var fixture = new EmptyRepositoryFixture();
@@ -295,7 +296,7 @@ public void ConfigChangeInvalidatesCache()
         CommitsSinceVersionSource: 19
         CommitsSinceVersionSourcePadded: 0019
         CommitDate: 2015-11-10
-        RepositoryDirtyFlag: 
+        UncommittedChanges: 0 
         ";
 
             using var fixture = new EmptyRepositoryFixture();
@@ -359,7 +360,7 @@ public void NoCacheBypassesCache()
         CommitsSinceVersionSource: 19
         CommitsSinceVersionSourcePadded: 0019
         CommitDate: 2015-11-10
-        RepositoryDirtyFlag: 
+        UncommittedChanges: 0
         ";
 
             using var fixture = new EmptyRepositoryFixture();
diff --git a/src/GitVersionCore.Tests/Helpers/TestableVersionVariables.cs b/src/GitVersionCore.Tests/Helpers/TestableVersionVariables.cs
@@ -14,12 +14,12 @@ public TestableVersionVariables(
             string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
             string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
             string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
-            string commitsSinceVersionSourcePadded = "", string repositoryDirtyFlag = "") : base(
+            string commitsSinceVersionSourcePadded = "", string uncommittedChanges = "") : base(
                 major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName,
                 sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
                 assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
                 preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
-                nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, repositoryDirtyFlag)
+                nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, uncommittedChanges)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using GitTools.Testing;
@@ -97,23 +98,28 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
             fixture.AssertFullSemver("1.1.0-alpha.1");
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void HasDirtyFlagWhenUncommittedChangesAreInRepo(bool stageFile)
+        [TestCase(true, 1)]
+        [TestCase(false, 1)]
+        [TestCase(true, 5)]
+        [TestCase(false, 5)]
+        public void HasDirtyFlagWhenUncommittedChangesAreInRepo(bool stageFile, int numberOfFiles)
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeACommit();
-           
-            var tempFile = Path.GetTempFileName();
-            var repoFile = Path.Combine(fixture.RepositoryPath, Path.GetFileNameWithoutExtension(tempFile) + ".txt");
-            File.Move(tempFile, repoFile);
-            File.WriteAllText(repoFile, "Hello world");
 
-            if (stageFile)
-                Commands.Stage(fixture.Repository, repoFile);
+            for (int i = 0; i < numberOfFiles; i++)
+            {
+                var tempFile = Path.GetTempFileName();
+                var repoFile = Path.Combine(fixture.RepositoryPath, Path.GetFileNameWithoutExtension(tempFile) + ".txt");
+                File.Move(tempFile, repoFile);
+                File.WriteAllText(repoFile, $"Hello world / testfile {i}");
+
+                if (stageFile)
+                    Commands.Stage(fixture.Repository, repoFile);
+            }
 
             var version = fixture.GetVersion();
-            version.RepositoryDirtyFlag.ShouldBe("Dirty");
+            version.UncommittedChanges.ShouldBe(numberOfFiles.ToString(CultureInfo.InvariantCulture));
         }
 
         [Test]
@@ -123,7 +129,8 @@ public void NoDirtyFlagInCleanRepository()
             fixture.Repository.MakeACommit();
 
             var version = fixture.GetVersion();
-            version.RepositoryDirtyFlag.ShouldBe(null);
+            var zero = 0;
+            version.UncommittedChanges.ShouldBe(zero.ToString(CultureInfo.InvariantCulture));
         }
     }
 }
diff --git a/src/GitVersionCore.Tests/Model/CommitDateTests.cs b/src/GitVersionCore.Tests/Model/CommitDateTests.cs
@@ -24,7 +24,7 @@ public void CommitDateFormatTest(string format, string expectedOutcome)
             var formatValues = new SemanticVersionFormatValues(
                                     new SemanticVersion
                                     {
-                                        BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero), false), // assume time zone is UTC
+                                        BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero), 0), // assume time zone is UTC
 
                                     },
                                     new EffectiveConfiguration(
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -29,6 +29,6 @@
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
-  "RepositoryDirtyFlag":"",
+  "UncommittedChanges":0,
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/JsonVersionBuilderTests.cs b/src/GitVersionCore.Tests/VersionCalculation/JsonVersionBuilderTests.cs
@@ -28,7 +28,7 @@ public void Json()
                 Minor = 2,
                 Patch = 0,
                 PreReleaseTag = "unstable4",
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), false)
+                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
             };
 
             var config = new TestEffectiveConfiguration();
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -19,7 +19,7 @@ public class NextVersionCalculatorTests : TestBase
         [Test]
         public void ShouldIncrementVersionBasedOnConfig()
         {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, "master", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, false);
+            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, "master", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
 
             var contextBuilder = new GitVersionContextBuilder();
 
@@ -43,7 +43,7 @@ public void ShouldIncrementVersionBasedOnConfig()
         [Test]
         public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, "master", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, false);
+            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, "master", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
 
             var contextBuilder = new GitVersionContextBuilder();
 
@@ -68,7 +68,7 @@ public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         [Test]
         public void AppliesBranchPreReleaseTag()
         {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 2, "develop", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, false);
+            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 2, "develop", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
             var contextBuilder = new GitVersionContextBuilder();
 
             contextBuilder
diff --git a/src/GitVersionCore.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFile.approved.txt b/src/GitVersionCore.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFile.approved.txt
@@ -26,10 +26,10 @@
   <?define PreReleaseNumber=""?>
   <?define PreReleaseTag=""?>
   <?define PreReleaseTagWithDash=""?>
-  <?define RepositoryDirtyFlag=""?>
   <?define SemVer="1.2.3"?>
   <?define Sha="commitSha"?>
   <?define ShortSha="commitShortSha"?>
+  <?define UncommittedChanges="0"?>
   <?define VersionSourceSha="versionSourceSha"?>
   <?define WeightedPreReleaseNumber="0"?>
 </Include>
diff --git a/src/GitVersionCore.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFileWhenFileAlreadyExists.approved.txt b/src/GitVersionCore.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFileWhenFileAlreadyExists.approved.txt
@@ -26,10 +26,10 @@
   <?define PreReleaseNumber=""?>
   <?define PreReleaseTag=""?>
   <?define PreReleaseTagWithDash=""?>
-  <?define RepositoryDirtyFlag=""?>
   <?define SemVer="1.2.3"?>
   <?define Sha="commitSha"?>
   <?define ShortSha="commitShortSha"?>
+  <?define UncommittedChanges="0"?>
   <?define VersionSourceSha="versionSourceSha"?>
   <?define WeightedPreReleaseNumber="0"?>
 </Include>
diff --git a/src/GitVersionCore.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersionCore.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
@@ -58,6 +58,6 @@ static class GitVersionInformation
     public static string VersionSourceSha = "versionSourceSha";
     public static string CommitsSinceVersionSource = "5";
     public static string CommitsSinceVersionSourcePadded = "0005";
-    public static string RepositoryDirtyFlag = "";
+    public static string UncommittedChanges = "0";
     public static string CommitDate = "2014-03-06";
 }
diff --git a/src/GitVersionCore.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersionCore.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
@@ -60,5 +60,5 @@ type GitVersionInformation =
     static member VersionSourceSha = "versionSourceSha"
     static member CommitsSinceVersionSource = "5"
     static member CommitsSinceVersionSourcePadded = "0005"
-    static member RepositoryDirtyFlag = ""
+    static member UncommittedChanges = "0"
     static member CommitDate = "2014-03-06"
diff --git a/src/GitVersionCore.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersionCore.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
@@ -61,7 +61,7 @@ Namespace Global
         Public Shared VersionSourceSha As String = "versionSourceSha"
         Public Shared CommitsSinceVersionSource As String = "5"
         Public Shared CommitsSinceVersionSourcePadded As String = "0005"
-        Public Shared RepositoryDirtyFlag As String = ""
+        Public Shared UncommittedChanges As String = "0"
         Public Shared CommitDate As String = "2014-03-06"
     End Class
 
diff --git a/src/GitVersionCore.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs b/src/GitVersionCore.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
@@ -448,7 +448,7 @@ private void VerifyAssemblyInfoFile(
             fileSystem = Substitute.For<IFileSystem>();
             var version = new SemanticVersion
             {
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, false),
+                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
                 Major = 2,
                 Minor = 3,
                 Patch = 1
diff --git a/src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs b/src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
@@ -38,7 +38,7 @@ public void ShouldCreateFile(string fileExtension)
                 Patch = 3,
                 PreReleaseTag = "unstable4",
                 BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5,
-                    "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), false)
+                    "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
             };
 
             var sp = ConfigureServices();
diff --git a/src/GitVersionCore.Tests/VersionConverters/InformationalVersionBuilderTests.cs b/src/GitVersionCore.Tests/VersionConverters/InformationalVersionBuilderTests.cs
@@ -30,7 +30,7 @@ public void ValidateInformationalVersionBuilder(string branchName, string sha, s
                 Minor = minor,
                 Patch = patch,
                 PreReleaseTag = tag,
-                BuildMetaData = new SemanticVersionBuildMetaData(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue, false),
+                BuildMetaData = new SemanticVersionBuildMetaData(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue, 0),
             };
             var informationalVersion = semanticVersion.ToString("i");
 
diff --git a/src/GitVersionCore.Tests/VersionConverters/ProjectFileUpdaterTests.cs b/src/GitVersionCore.Tests/VersionConverters/ProjectFileUpdaterTests.cs
@@ -334,7 +334,7 @@ private void VerifyAssemblyInfoFile(
             fileSystem = Substitute.For<IFileSystem>();
             var version = new SemanticVersion
             {
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, false),
+                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
                 Major = 2,
                 Minor = 3,
                 Patch = 1
diff --git a/src/GitVersionCore/Core/Abstractions/IRepositoryMetadataProvider.cs b/src/GitVersionCore/Core/Abstractions/IRepositoryMetadataProvider.cs
@@ -44,6 +44,6 @@ public interface IRepositoryMetadataProvider
         string ShortenObjectId(GitObject commit);
         VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context);
 
-        bool HasUncommittedChanges();
+        int GetNumberOfUncommittedChanges();
     }
 }
diff --git a/src/GitVersionCore/Core/GitVersionContextFactory.cs b/src/GitVersionCore/Core/GitVersionContextFactory.cs
@@ -46,9 +46,9 @@ private GitVersionContext Init(Branch currentBranch, string commitId = null, boo
             var currentBranchConfig = branchConfigurationCalculator.GetBranchConfiguration(currentBranch, currentCommit, configuration);
             var effectiveConfiguration = configuration.CalculateEffectiveConfiguration(currentBranchConfig);
             var currentCommitTaggedVersion = repositoryMetadataProvider.GetCurrentCommitTaggedVersion(currentCommit, effectiveConfiguration);
-            var hasUncommittedChanges = repositoryMetadataProvider.HasUncommittedChanges();
+            var numberOfUncommittedChanges = repositoryMetadataProvider.GetNumberOfUncommittedChanges();
 
-            return new GitVersionContext(currentBranch, currentCommit, configuration, effectiveConfiguration, currentCommitTaggedVersion, hasUncommittedChanges);
+            return new GitVersionContext(currentBranch, currentCommit, configuration, effectiveConfiguration, currentCommitTaggedVersion, numberOfUncommittedChanges);
         }
     }
 }
diff --git a/src/GitVersionCore/Core/RepositoryMetadataProvider.cs b/src/GitVersionCore/Core/RepositoryMetadataProvider.cs
@@ -500,19 +500,35 @@ private IEnumerable<BranchCommit> GetMergeCommitsForBranch(Branch branch, Config
             return branchMergeBases;
         }
 
-        public bool HasUncommittedChanges()
+        public int GetNumberOfUncommittedChanges()
         {
             // check if we have a branch tip at all to behave properly with empty repos
             // => return that we have actually uncomitted changes because we are apparently
             // running GitVersion on something which lives inside this brand new repo _/\Ö/\_
             if (repository.Head?.Tip == null || repository.Diff == null)
-                return true;
+            {
+                // this is a somewhat cumbersome way of figuring out the number of changes in the repo
+                // which is more expensive than to use the Diff as it gathers more info, but
+                // we can't use the other method when we are dealing with a new/empty repo
+                try
+                {
+                    var status = repository.RetrieveStatus();
+                    return status.Untracked.Count() + status.Staged.Count();
+
+                }
+                catch(Exception)
+                {
+                    return Int32.MaxValue;  // this should be somewhat puzzling to see,
+                                            // so we may have reached our goal to show that
+                                            // that repo is really "Dirty"...
+                }
+            }
 
             // gets all changes of the last commit vs Staging area and WT
             var changes = repository.Diff.Compare<TreeChanges>(repository.Head.Tip.Tree,
                                                   DiffTargets.Index | DiffTargets.WorkingDirectory);
 
-            return changes.Count > 0;
+            return changes.Count;
         }
 
         private class MergeBaseData
diff --git a/src/GitVersionCore/Model/GitVersionContext.cs b/src/GitVersionCore/Model/GitVersionContext.cs
diff --git a/src/GitVersionCore/Model/VersionVariables.cs b/src/GitVersionCore/Model/VersionVariables.cs
diff --git a/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
diff --git a/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
diff --git a/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
diff --git a/src/GitVersionCore/VersionCalculation/VariableProvider.cs b/src/GitVersionCore/VersionCalculation/VariableProvider.cs
diff --git a/src/GitVersionTask.MsBuild/Tasks/GetVersion.cs b/src/GitVersionTask.MsBuild/Tasks/GetVersion.cs

Original file line number	Diff line number	Diff line change
@@ -40,7 +40,7 @@ Running `GitVersion.exe` in your repo will show you what is available. For the
`40`	`40`	`"CommitsSinceVersionSource":1,`
`41`	`41`	`"CommitsSinceVersionSourcePadded":"0001",`
`42`	`42`	`"CommitDate":"2014-03-06",`
`43`		`- "RepositoryDirtyFlag": ""`
	`43`	`+ "UncommittedChanges": 0`
`44`	`44`	`}`
`45`	`45`	```
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public TestableVersionVariables(`
`14`	`14`	`string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",`
`15`	`15`	`string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",`
`16`	`16`	`string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",`
`17`		`- string commitsSinceVersionSourcePadded = "", string repositoryDirtyFlag = "") : base(`
	`17`	`+ string commitsSinceVersionSourcePadded = "", string uncommittedChanges = "") : base(`
`18`	`18`	`major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName,`
`19`	`19`	`sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,`
`20`	`20`	`assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,`
`21`	`21`	`preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,`
`22`		`- nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, repositoryDirtyFlag)`
	`22`	`+ nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, uncommittedChanges)`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void CommitDateFormatTest(string format, string expectedOutcome)`
`24`	`24`	`var formatValues = new SemanticVersionFormatValues(`
`25`	`25`	`new SemanticVersion`
`26`	`26`	`{`
`27`		`- BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero), false), // assume time zone is UTC`
	`27`	`+ BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero), 0), // assume time zone is UTC`
`28`	`28`
`29`	`29`	`},`
`30`	`30`	`new EffectiveConfiguration(`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@`
`29`	`29`	`"VersionSourceSha":"versionSourceSha",`
`30`	`30`	`"CommitsSinceVersionSource":5,`
`31`	`31`	`"CommitsSinceVersionSourcePadded":"0005",`
`32`		`- "RepositoryDirtyFlag":"",`
	`32`	`+ "UncommittedChanges":0,`
`33`	`33`	`"CommitDate":"2014-03-06"`
`34`	`34`	`}`