Don't use interactivity in this context

NeogitOrg · Aug 3, 2023 · fa4342d · fa4342d
1 parent 21a0f7b
commit fa4342d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lua/neogit/popups/fetch/init.lua b/lua/neogit/popups/fetch/init.lua
@@ -5,15 +5,16 @@ local popup = require("neogit.lib.popup")
 local M = {}
 
 function M.create()
-  local upstream = git.branch.upstream_remote()
+  -- TODO: Match the logic in Magit for a new branch without an upstream/pushremote
+  local upstream = git.branch.upstream_remote { interactive = false }
 
   local p = popup
     .builder()
     :name("NeogitFetchPopup")
     :switch("p", "prune", "Prune deleted branches")
     :switch("t", "tags", "Fetch all tags")
     :group_heading("Fetch from")
-    :action("p", git.branch.pushRemote_label(), actions.fetch_pushremote)
+    :action("p", git.branch.pushRemote_label({ branch = false }), actions.fetch_pushremote)
     :action_if(upstream, "u", upstream, actions.fetch_upstream)
     :action("e", "elsewhere", actions.fetch_elsewhere)
     :action("a", "all remotes", actions.fetch_all_remotes)