Skip to content

Commit 8f8aaea

Browse files
committed
fix: no remote branch's fullname starts with refs/heads/
Signed-off-by: leo <longshuang@msn.cn>
1 parent 8189114 commit 8f8aaea

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎src/ViewModels/Push.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,13 @@ private void PostSelectedRemoteChanged()
291291
var mergeTarget = new Commands.Config(_repo.FullPath).Get($"branch.\"{_selectedLocalBranch.Name}\".merge");
292292
if (!string.IsNullOrEmpty(mergeTarget))
293293
{
294-
var target = branches.Find(x => x.FullName.Equals(mergeTarget, StringComparison.Ordinal));
294+
var cleanName = mergeTarget.StartsWith("refs/heads/", StringComparison.Ordinal) ? mergeTarget.Substring(11) : mergeTarget;
295+
var target = branches.Find(x => x.Name.Equals(cleanName, StringComparison.Ordinal));
295296
if (target == null)
296297
{
297298
target = new Models.Branch()
298299
{
299-
Name = mergeTarget.StartsWith("refs/heads/", StringComparison.Ordinal) ? mergeTarget.Substring(11) : mergeTarget,
300+
Name = cleanName,
300301
Remote = _selectedRemote.Name,
301302
Head = "---", // Not used by `git push` command but used by Views
302303
};

0 commit comments

Comments
 (0)