From eb20d013a1717a0ecc6ee3563e69261aaf7c98eb Mon Sep 17 00:00:00 2001 From: Alex Bochannek Date: Fri, 23 Jul 2021 20:29:59 +0200 Subject: [PATCH] Fix bug#49699 * lisp/net/tramp-sh.el (tramp-scp-strict-file-name-checking): Adapt check for macOS. (Bug#49699) --- lisp/net/tramp-sh.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8b4c78fe65b..f94508303df 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4782,7 +4782,9 @@ Goes through the list `tramp-inline-compress-commands'." (with-temp-buffer (tramp-call-process vec "scp" nil t nil "-T") (goto-char (point-min)) - (unless (search-forward-regexp "unknown option -- T" nil t) + (unless + (search-forward-regexp + "\\(illegal\\|unknown\\) option -- T" nil t) (setq tramp-scp-strict-file-name-checking "-T"))))))) tramp-scp-strict-file-name-checking))) -- 2.39.2