emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ssh-deploy ae5354a 065/133: Fixed issue were remote pat


From: Stefan Monnier
Subject: [elpa] externals/ssh-deploy ae5354a 065/133: Fixed issue were remote paths with symlinks didn't work with recursive diff function
Date: Sat, 27 Mar 2021 14:48:45 -0400 (EDT)

branch: externals/ssh-deploy
commit ae5354ad9e65fd3874963833f332c3c583f523b2
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Fixed issue were remote paths with symlinks didn't work with recursive diff 
function
---
 ssh-deploy.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssh-deploy.el b/ssh-deploy.el
index 7404e09..d4f5d95 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -1166,13 +1166,13 @@
              (file-exists-p buffer-file-name))
         (let* ((path-local (file-truename buffer-file-name))
                (root-local (file-truename ssh-deploy-root-local))
-               (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
+               (path-remote (file-truename (expand-file-name 
(ssh-deploy--get-relative-path root-local path-local) ssh-deploy-root-remote))))
           (ssh-deploy-diff path-local path-remote root-local ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async ssh-deploy-async-with-threads 
ssh-deploy-on-explicit-save ssh-deploy-revision-folder 
ssh-deploy-automatically-detect-remote-changes))
       (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                  (file-exists-p default-directory))
         (let* ((path-local (file-truename default-directory))
                (root-local (file-truename ssh-deploy-root-local))
-               (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
+               (path-remote (file-truename (expand-file-name 
(ssh-deploy--get-relative-path root-local path-local) ssh-deploy-root-remote))))
           (ssh-deploy-diff path-local path-remote root-local ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async ssh-deploy-async-with-threads 
ssh-deploy-on-explicit-save ssh-deploy-revision-folder 
ssh-deploy-automatically-detect-remote-changes))))))
 
 ;;;###autoload



reply via email to

[Prev in Thread] Current Thread [Next in Thread]