cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 15:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1355

Browse Source 
Checking out a remote branch didn't set the tracking details
This commit is contained in:
Jordan Brown
2022-02-03 12:48:53 -05:00
parent d4edf27ea9
commit 7f642433bd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Repository/Repository.cs
+7 -4
View File
@@ -830,15 +830,18 @@ namespace Tgstation.Server.Host.Components.Repository
{
// Maybe (likely) a remote?
var remoteName = $"origin/{committish}";
var potentialBranch = libGitRepo.Branches.FirstOrDefault(
var remoteBranch = libGitRepo.Branches.FirstOrDefault(
branch => branch.FriendlyName.Equals(remoteName, StringComparison.Ordinal));
cancellationToken.ThrowIfCancellationRequested();
if (potentialBranch == default)
if (remoteBranch == default)
throw;
logger.LogDebug("Creating local branch for {0}...", potentialBranch.FriendlyName);
libGitRepo.CreateBranch(committish, potentialBranch.Tip);
logger.LogDebug("Creating local branch for {0}...", remoteBranch.FriendlyName);
var branch = libGitRepo.CreateBranch(committish, remoteBranch.Tip);
libGitRepo.Branches.Update(branch, branchUpdate => branchUpdate.TrackedBranch = remoteBranch.CanonicalName);
cancellationToken.ThrowIfCancellationRequested();
RunCheckout();