From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 24 Jun 2018 08:24:26 +0000 (+0200)
Subject: Fix Bug#31941
X-Git-Tag: emacs-26.1.90~329
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d7707886d9b2903666fdcfd7c7962b5e17e6b36;p=emacs.git

Fix Bug#31941

* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file): In case of
FILENAME being a directory, check whether `copy-directory' could
be avoided.  Suggested by Stephen Nutt <stnutt@gmail.com>.  (Bug#31941)
(tramp-do-copy-or-rename-file-directly): Call "cp" with "-r".
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 02fb8648d80..3e99ab567f0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2038,7 +2038,9 @@ file names."
   (unless (memq op '(copy rename))
     (error "Unknown operation `%s', must be `copy' or `rename'" op))
 
-  (if (file-directory-p filename)
+  (if (and
+       (file-directory-p filename)
+       (not (tramp-equal-remote filename newname)))
       (progn
 	(copy-directory filename newname keep-date t)
 	(when (eq op 'rename) (delete-directory filename 'recursive)))
@@ -2187,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 -p")
-			((eq op 'copy) "cp -f")
+      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -r -p")
+			((eq op 'copy) "cp -f -r")
 			((eq op 'rename) "mv -f")
 			(t (tramp-error
 			    v 'file-error