* net/tramp-sh.el (tramp-do-copy-or-rename-file-directly): In the

`rename' case, check whether source directory has set the sticky bit.

1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9cc913724fd..22ea7714743 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2110,6 +2110,12 @@ the uid and gid from FILENAME."
            ;; We can do it directly.
            ((let (file-name-handler-alist)
               (and (file-readable-p localname1)
+                   ;; No sticky bit when renaming.
+                   (or (eq op 'copy)
+                       (zerop
+                        (logand
+                         (file-modes (file-name-directory localname1))
+                         (tramp-compat-octal-to-decimal "1000"))))
                    (file-writable-p (file-name-directory localname2))
                    (or (file-directory-p localname2)
                        (file-writable-p localname2))))