github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-23 10:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: only auto-track remote branch after creating new local branch when the created branch's name is the same with based remote branch (#1926)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-11-19 20:16:05 +08:00
parent f736f3bdc6
commit fbf6a646ba
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ViewModels/CreateBranch.cs
View File

@@ -186,20 +186,9 @@ namespace SourceGit.ViewModels
.CreateAsync(_baseOnRevision, _allowOverwrite);
}
if (succ && BasedOn is Models.Branch { IsLocal: false } basedOn)
if (succ && BasedOn is Models.Branch { IsLocal: false } basedOn && _name.Equals(basedOn.Name, StringComparison.Ordinal))
{
var autoSetUpstream = true;
foreach (var b in _repo.Branches)
{
if (b.IsLocal && b.Upstream.Equals(basedOn.FullName, StringComparison.Ordinal))
{
autoSetUpstream = false;
break;
}
}
if (autoSetUpstream)
await new Commands.Branch(_repo.FullPath, _name)
await new Commands.Branch(_repo.FullPath, _name)
.Use(log)
.SetUpstreamAsync(basedOn);
}