From c8bee2f6ba9f611e125126b7729a91ebdb2b7d31 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 14 Mar 2025 09:36:34 +0800
Subject: [PATCH] code_review: PR #1093

Merge deleting branch and tag on remote into `SourceGit.Commands.Push(repo, remote, refname, isDelete)`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Branch.cs      | 17 +++++------------
 src/Commands/Push.cs        |  4 ++--
 src/Commands/Tag.cs         |  4 +---
 src/ViewModels/CreateTag.cs |  2 +-
 src/ViewModels/PushTag.cs   |  7 ++++---
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Commands/Branch.cs b/src/Commands/Branch.cs
index d56dfa97..2dc8a98d 100644
--- a/src/Commands/Branch.cs
+++ b/src/Commands/Branch.cs
@@ -54,21 +54,14 @@
 
         public static bool DeleteRemote(string repo, string remote, string name)
         {
+            bool exists = new Remote(repo).HasBranch(remote, name);
+            if (exists)
+                return new Push(repo, remote, $"refs/heads/{name}", true).Exec();
+
             var cmd = new Command();
             cmd.WorkingDirectory = repo;
             cmd.Context = repo;
-
-            bool exists = new Remote(repo).HasBranch(remote, name);
-            if (exists)
-            {
-                cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
-                cmd.Args = $"push {remote} --delete refs/heads/{name}";
-            }
-            else
-            {
-                cmd.Args = $"branch -D -r {remote}/{name}";
-            }
-
+            cmd.Args = $"branch -D -r {remote}/{name}";
             return cmd.Exec();
         }
     }
diff --git a/src/Commands/Push.cs b/src/Commands/Push.cs
index 69b859ab..dc81f606 100644
--- a/src/Commands/Push.cs
+++ b/src/Commands/Push.cs
@@ -26,7 +26,7 @@ namespace SourceGit.Commands
             Args += $"{remote} {local}:{remoteBranch}";
         }
 
-        public Push(string repo, string remote, string tag, bool isDelete)
+        public Push(string repo, string remote, string refname, bool isDelete)
         {
             WorkingDirectory = repo;
             Context = repo;
@@ -36,7 +36,7 @@ namespace SourceGit.Commands
             if (isDelete)
                 Args += "--delete ";
 
-            Args += $"{remote} refs/tags/{tag}";
+            Args += $"{remote} {refname}";
         }
 
         protected override void OnReadline(string line)
diff --git a/src/Commands/Tag.cs b/src/Commands/Tag.cs
index fa11e366..23dbb11c 100644
--- a/src/Commands/Tag.cs
+++ b/src/Commands/Tag.cs
@@ -48,9 +48,7 @@ namespace SourceGit.Commands
             if (remotes != null)
             {
                 foreach (var r in remotes)
-                {
-                    new Push(repo, r.Name, name, true).Exec();
-                }
+                    new Push(repo, r.Name, $"refs/tags/{name}", true).Exec();
             }
 
             return true;
diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs
index a6d7255b..86ae7118 100644
--- a/src/ViewModels/CreateTag.cs
+++ b/src/ViewModels/CreateTag.cs
@@ -96,7 +96,7 @@ namespace SourceGit.ViewModels
                     foreach (var remote in remotes)
                     {
                         SetProgressDescription($"Pushing tag to remote {remote.Name} ...");
-                        new Commands.Push(_repo.FullPath, remote.Name, _tagName, false).Exec();
+                        new Commands.Push(_repo.FullPath, remote.Name, $"refs/tags/{_tagName}", false).Exec();
                     }
                 }
 
diff --git a/src/ViewModels/PushTag.cs b/src/ViewModels/PushTag.cs
index 54673fbe..de2941d2 100644
--- a/src/ViewModels/PushTag.cs
+++ b/src/ViewModels/PushTag.cs
@@ -43,13 +43,14 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                bool succ = true;
+                var succ = true;
+                var tag = $"refs/tags/{Target.Name}";
                 if (_pushAllRemotes)
                 {
                     foreach (var remote in _repo.Remotes)
                     {
                         SetProgressDescription($"Pushing tag to remote {remote.Name} ...");
-                        succ = new Commands.Push(_repo.FullPath, remote.Name, Target.Name, false).Exec();
+                        succ = new Commands.Push(_repo.FullPath, remote.Name, tag, false).Exec();
                         if (!succ)
                             break;
                     }
@@ -57,7 +58,7 @@ namespace SourceGit.ViewModels
                 else
                 {
                     SetProgressDescription($"Pushing tag to remote {SelectedRemote.Name} ...");
-                    succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, Target.Name, false).Exec();
+                    succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, tag, false).Exec();
                 }
 
                 CallUIThread(() => _repo.SetWatcherEnabled(true));