Fix rebasing onto upstream when the upstream is not on a remote.

Author: CKolkey

lua/neogit/popups/rebase/actions.lua

@@ -31,19 +31,14 @@ function M.onto_pushRemote(popup)
 end
 
 function M.onto_upstream(popup)
-  local upstream
-  if git.repo.state.upstream.ref then
-    upstream = string.format("refs/remotes/%s", git.repo.state.upstream.ref)
-  else
-    local target = FuzzyFinderBuffer.new(git.refs.list_remote_branches()):open_async()
-    if not target then
-      return
-    end
-
-    upstream = string.format("refs/remotes/%s", target)
+  local upstream = git.branch.upstream(git.branch.current())
+  if not upstream then
+    upstream = FuzzyFinderBuffer.new(git.refs.list_branches()):open_async()
   end
 
-  git.rebase.onto_branch(upstream, popup:get_arguments())
+  if upstream then
+    git.rebase.onto_branch(upstream, popup:get_arguments())
+  end
 end
 
 function M.onto_elsewhere(popup)