Make branch name comparison case insensitive

Author: asbjornu

src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs

@@ -41,7 +41,7 @@ public BranchConfig GetBranchConfiguration(Branch targetBranch, Commit currentCo
             if (matchingBranches.Increment == IncrementStrategy.Inherit)
             {
                 matchingBranches = InheritBranchConfiguration(targetBranch, matchingBranches, currentCommit, configuration, excludedInheritBranches);
-                if (matchingBranches.Name == FallbackConfigName && matchingBranches.Increment == IncrementStrategy.Inherit)
+                if (matchingBranches.Name.IsEquivalentTo(FallbackConfigName) && matchingBranches.Increment == IncrementStrategy.Inherit)
                 {
                     // We tried, and failed to inherit, just fall back to patch
                     matchingBranches.Increment = IncrementStrategy.Patch;
@@ -152,7 +152,7 @@ private BranchConfig InheritBranchConfiguration(Branch targetBranch, BranchConfi
 
                 var inheritingBranchConfig = GetBranchConfiguration(chosenBranch, currentCommit, configuration, excludedInheritBranches);
                 var configIncrement = inheritingBranchConfig.Increment;
-                if (inheritingBranchConfig.Name == FallbackConfigName && configIncrement == IncrementStrategy.Inherit)
+                if (inheritingBranchConfig.Name.IsEquivalentTo(FallbackConfigName) && configIncrement == IncrementStrategy.Inherit)
                 {
                     log.Warning("Fallback config inherits by default, dropping to patch increment");
                     configIncrement = IncrementStrategy.Patch;

src/GitVersionCore/Core/GitPreparer.cs

@@ -271,7 +271,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                     const string moveBranchMsg = "Move one of the branches along a commit to remove warning";
 
                     log.Warning($"Found more than one local branch pointing at the commit '{headSha}' ({csvNames}).");
-                    var master = localBranchesWhereCommitShaIsHead.SingleOrDefault(n => n.FriendlyName == "master");
+                    var master = localBranchesWhereCommitShaIsHead.SingleOrDefault(n => n.FriendlyName.IsEquivalentTo("master"));
                     if (master != null)
                     {
                         log.Warning("Because one of the branches is 'master', will build master." + moveBranchMsg);

src/GitVersionCore/Core/RepositoryMetadataProvider.cs

@@ -184,9 +184,9 @@ public Branch GetTargetBranch(string targetBranch)
                     // In the case where HEAD is not the desired branch, try to find the branch with matching name
                     desiredBranch = repository.Branches?
                         .SingleOrDefault(b =>
-                            b.CanonicalName == targetBranch ||
-                            b.FriendlyName == targetBranch ||
-                            b.NameWithoutRemote() == targetBranch);
+                            b.CanonicalName.IsEquivalentTo(targetBranch) ||
+                            b.FriendlyName.IsEquivalentTo(targetBranch) ||
+                            b.NameWithoutRemote().IsEquivalentTo(targetBranch));
 
                     // Failsafe in case the specified branch is invalid
                     desiredBranch ??= repository.Head;

src/GitVersionCore/Extensions/LibGitExtensions.cs

@@ -38,7 +38,7 @@ public static bool IsSameBranch(this Branch branch, Branch otherBranch)
             var otherBranchFriendlyName = otherBranch.NameWithoutRemote();
             var branchFriendlyName = branch.NameWithoutRemote();
 
-            return otherBranchFriendlyName == branchFriendlyName;
+            return otherBranchFriendlyName.IsEquivalentTo(branchFriendlyName);
         }
 
         /// <summary>

src/GitVersionCore/Extensions/RepositoryExtensions.cs

@@ -54,7 +54,7 @@ public static void EnsureLocalBranchExistsForCurrentBranch(this IRepository repo
 
             var repoTipId = repoTip.Id;
 
-            if (repo.Branches.All(b => b.CanonicalName != localCanonicalName))
+            if (repo.Branches.All(b => !b.CanonicalName.IsEquivalentTo(localCanonicalName)))
             {
                 log.Info(isBranch ? $"Creating local branch {localCanonicalName}"
                     : $"Creating local branch {localCanonicalName} pointing at {repoTipId}");
@@ -142,17 +142,20 @@ public static void CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(this IRepos
         {
             var prefix = $"refs/remotes/{remoteName}/";
             var remoteHeadCanonicalName = $"{prefix}HEAD";
+            var remoteTrackingReferences = repo.Refs
+                .FromGlob(prefix + "*")
+                .Where(r => !r.CanonicalName.IsEquivalentTo(remoteHeadCanonicalName));
 
-            foreach (var remoteTrackingReference in repo.Refs.FromGlob(prefix + "*").Where(r => r.CanonicalName != remoteHeadCanonicalName))
+            foreach (var remoteTrackingReference in remoteTrackingReferences)
             {
                 var remoteTrackingReferenceName = remoteTrackingReference.CanonicalName;
                 var branchName = remoteTrackingReferenceName.Substring(prefix.Length);
                 var localCanonicalName = "refs/heads/" + branchName;
 
                 // We do not want to touch our current branch
-                if (branchName == repo.Head.FriendlyName) continue;
+                if (branchName.IsEquivalentTo(repo.Head.FriendlyName)) continue;
 
-                if (repo.Refs.Any(x => x.CanonicalName == localCanonicalName))
+                if (repo.Refs.Any(x => x.CanonicalName.IsEquivalentTo(localCanonicalName)))
                 {
                     var localRef = repo.Refs[localCanonicalName];
                     var remotedirectReference = remoteTrackingReference.ResolveToDirectReference();

src/GitVersionCore/Extensions/StringExtensions.cs

@@ -129,5 +129,10 @@ public static string RegexReplace(this string input, string pattern, string repl
         {
             return Regex.Replace(input, pattern, replace, options);
         }
+
+        public static bool IsEquivalentTo(this string self, string other)
+        {
+            return String.Equals(self, other, StringComparison.OrdinalIgnoreCase);
+        }
     }
 }

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -109,7 +109,7 @@ private void UpdatePreReleaseTag(SemanticVersion semanticVersion, string branchN
 
             var lastTag = repositoryMetadataProvider
                 .GetVersionTagsOnBranch(context.CurrentBranch, context.Configuration.GitTagPrefix)
-                .FirstOrDefault(v => v.PreReleaseTag.Name == tagToUse);
+                .FirstOrDefault(v => v.PreReleaseTag.Name.IsEquivalentTo(tagToUse));
 
             if (lastTag != null &&
                 MajorMinorPatchEqual(lastTag, semanticVersion) &&