From 54f36e236d927f759201fce6e66a0638ef6ee2e6 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Sat, 21 Sep 2024 05:42:48 -0500 Subject: [PATCH] More git test tweaks --- .../RepoTestUtility.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Synthesis.Bethesda.UnitTests/RepoTestUtility.cs b/Synthesis.Bethesda.UnitTests/RepoTestUtility.cs index 25e7d65a..16f5f187 100644 --- a/Synthesis.Bethesda.UnitTests/RepoTestUtility.cs +++ b/Synthesis.Bethesda.UnitTests/RepoTestUtility.cs @@ -37,7 +37,14 @@ public TempFolder GetRepository( LibGit2Sharp.Commands.Stage(localRepo, AFile); var sig = Signature; localRepo.Commit("Initial commit", sig, sig); - + var defaultBranch = localRepo.Branches.First(); + if (defaultBranch.FriendlyName != DefaultBranch) + { + var dev = localRepo.Branches.Add(DefaultBranch, localRepo.Head.Tip); + localRepo.Branches.Remove(defaultBranch); + defaultBranch = dev; + } + if (createPatcherFiles) { var files = new CreateSolutionFile(IFileSystemExt.DefaultFilesystem, new ExportStringToFile()).Create(Path.Combine(local, SlnPath)) @@ -56,16 +63,11 @@ public TempFolder GetRepository( } var remoteRef = localRepo.Network.Remotes.Add("origin", remote); - var master = localRepo.Branches.First(); localRepo.Branches.Update( - master, + defaultBranch, b => b.Remote = remoteRef.Name, - b => b.UpstreamBranch = master.CanonicalName); - localRepo.Network.Push(master); - if (master.FriendlyName != DefaultBranch) - { - localRepo.Branches.Add("dev", localRepo.Head.Tip); - } + b => b.UpstreamBranch = defaultBranch.CanonicalName); + localRepo.Network.Push(defaultBranch); return folder; }