Fix an error in tramp-sh-handle-make-process. Dont' merge with master

* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't use heredoc
script whent the argument contains a string.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 7adfb49a858f759e5109d4458683b8c5ce5048ce..19d50fce4c5982663772c46ee47c1bba730b7b2b 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2863,8 +2863,10 @@ STDERR can also be a file name."
               ;; command.
               (heredoc (and (stringp program)
                             (string-match-p "sh$" program)
+                            (= (length args) 2)
                             (string-equal "-c" (car args))
-                            (= (length args) 2)))
+                            ;; Don't if there is a string.
+                            (not (string-match-p "'\\|\"" (cadr args)))))
               ;; When PROGRAM is nil, we just provide a tty.
               (args (if (not heredoc) args
                       (let ((i 250))