From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 25 Jun 2018 14:25:41 +0000 (+0200)
Subject: Fix last change in tramp-sh.el
X-Git-Tag: emacs-26.1.90~322
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=517dc0b;p=emacs.git

Fix last change in tramp-sh.el

* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-directly):
Use "-R" rather than "-r" for recursive copy of directories.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 3e99ab567f0..1a31596bf9b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2189,8 +2189,8 @@ the uid and gid from FILENAME."
 		     (file-attributes filename)))
 	(file-modes (tramp-default-file-modes filename)))
     (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -r -p")
-			((eq op 'copy) "cp -f -r")
+      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
+			((eq op 'copy) "cp -f")
 			((eq op 'rename) "mv -f")
 			(t (tramp-error
 			    v 'file-error
@@ -2200,6 +2200,8 @@ the uid and gid from FILENAME."
 	     (localname2 (if t2 (file-remote-p newname 'localname) newname))
 	     (prefix (file-remote-p (if t1 filename newname)))
              cmd-result)
+	(when (and (eq op 'copy) (file-directory-p filename))
+	  (setq cmd (concat cmd " -R")))
 
 	(cond
 	 ;; Both files are on a remote host, with same user.