[nongnu] elpa/git-commit 222cbb30f9: magit-pull-from-pushremote: Restore use of magit-run-git-with-editor

[ELPA Syncer]

branch: elpa/git-commit
commit 222cbb30f9fcbbb619b5c826301566c8efbae463
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    magit-pull-from-pushremote: Restore use of magit-run-git-with-editor
    
    7fee4089 (Refactor commands that can set the push-remote before their
    main task, 2019-03-29) switched magit-pull-from-pushremote to using
    magit-run-git-async instead of magit-run-git-with-editor (likely a
    copy-paste error from magit-push-current-to-pushremote).  Go back to
    using magit-run-git-with-editor because, when pull is configured to
    merge, Git will pop up an editor for non-fast-forward merges.
    
    Fixes #4604.
---
 docs/RelNotes/3.4.0.org | 3 +++
 lisp/magit-pull.el      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/RelNotes/3.4.0.org b/docs/RelNotes/3.4.0.org
index cc0c0aaa19..5021c97843 100644
--- a/docs/RelNotes/3.4.0.org
+++ b/docs/RelNotes/3.4.0.org
@@ -48,3 +48,6 @@
 
 - ~magit-discard~ didn't properly handle conflicts resulting from a
   file being renamed on both sides.  #4225
+
+- Since v3.0.0, ~magit-pull-from-pushremote~ has failed on
+  non-fast-forward merges.  #4604
diff --git a/lisp/magit-pull.el b/lisp/magit-pull.el
index db8783f3ed..8411bb3383 100644
--- a/lisp/magit-pull.el
+++ b/lisp/magit-pull.el
@@ -93,7 +93,7 @@ push-remote."
   (pcase-let ((`(,branch ,remote)
                (magit--select-push-remote "pull from there")))
     (run-hooks 'magit-credential-hook)
-    (magit-run-git-async "pull" args remote branch)))
+    (magit-run-git-with-editor "pull" args remote branch)))
 
 (defun magit-pull--pushbranch-description ()
   ;; Also used by `magit-rebase-onto-pushremote'.