Fix stale cache in Tramp (don't merge)

* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-directly):
Flush cache in time.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 48ba3d09e3e33166228a643a8d0aa909a1ef7eff..502040902e1291b42eb3d03dcb4278ccb1c9d53a 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2338,6 +2338,11 @@ the uid and gid from FILENAME."
                ;; Save exit.
                (ignore-errors (delete-file tmpfile)))))))))
 
+      ;; When newname did exist, we have wrong cached values.
+      (when t2
+       (with-parsed-tramp-file-name newname v2
+         (tramp-flush-file-properties v2 v2-localname)))
+
       ;; Set the time and mode.  Mask possible errors.
       (ignore-errors
          (when keep-date