enhance: leave remote branch to empty when the local branch tracks no branch in the remote while pulling changes (#469)

love-linger · love-linger · commit 1ec5cc416d11 · 2024-09-13T17:29:24.000+08:00
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
@@ -210,7 +210,7 @@ private void PostRemoteSelected()
             }
 
             if (!autoSelectedBranch)
-                SelectedBranch = branches.Count > 0 ? branches[0] : null;
+                SelectedBranch = null;
         }
 
         private readonly Repository _repo = null;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -490,10 +490,11 @@ public void Pull(bool autoStart)
                 return;
             }
 
-            if (autoStart)
-                PopupHost.ShowAndStartPopup(new Pull(this, null));
+            var pull = new Pull(this, null);
+            if (autoStart && pull.SelectedBranch != null)
+                PopupHost.ShowAndStartPopup(pull);
             else
-                PopupHost.ShowPopup(new Pull(this, null));
+                PopupHost.ShowPopup(pull);
         }
 
         public void Push(bool autoStart)

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ private void PostRemoteSelected()`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`if (!autoSelectedBranch)`
`213`		`- SelectedBranch = branches.Count > 0 ? branches[0] : null;`
	`213`	`+ SelectedBranch = null;`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`private readonly Repository _repo = null;`
Original file line number	Diff line number	Diff line change
`@@ -490,10 +490,11 @@ public void Pull(bool autoStart)`
`490`	`490`	`return;`
`491`	`491`	`}`
`492`	`492`
`493`		`- if (autoStart)`
`494`		`- PopupHost.ShowAndStartPopup(new Pull(this, null));`
	`493`	`+ var pull = new Pull(this, null);`
	`494`	`+ if (autoStart && pull.SelectedBranch != null)`
	`495`	`+ PopupHost.ShowAndStartPopup(pull);`
`495`	`496`	`else`
`496`		`- PopupHost.ShowPopup(new Pull(this, null));`
	`497`	`+ PopupHost.ShowPopup(pull);`
`497`	`498`	`}`
`498`	`499`
`499`	`500`	`public void Push(bool autoStart)`