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

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

[nongnu] elpa/git-commit de1dc8e 2/2: magit-convert-filename-for-git: Ex


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit de1dc8e 2/2: magit-convert-filename-for-git: Expand absolute filenames
Date: Mon, 16 Aug 2021 14:57:20 -0400 (EDT)

branch: elpa/git-commit
commit de1dc8e74bbfabf00ed20fceec2cb03c4493c510
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-convert-filename-for-git: Expand absolute filenames
---
 lisp/magit-git.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index eb6ff39..7efeba9 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1017,15 +1017,18 @@ Sorted from longest to shortest CYGWIN name."
 
 (defun magit-convert-filename-for-git (filename)
   "Convert FILENAME so that it can be passed to git.
-1. If it's a remote filename, then remove the remote part.
-2. Deal with an `windows-nt' Emacs vs. Cygwin Git incompatibility."
+1. If it's a absolute filename, then pass through `expand-file-name'
+   to replace things such as \"~/\" that Git does not understand.
+2. If it's a remote filename, then remove the remote part.
+3. Deal with an `windows-nt' Emacs vs. Cygwin Git incompatibility."
   (if (file-name-absolute-p filename)
       (-if-let ((cyg . win)
                 (cl-rassoc filename magit-cygwin-mount-points
                            :test (lambda (f win) (string-prefix-p win f))))
           (concat cyg (substring filename (length win)))
-        (or (file-remote-p filename 'localname)
-            filename))
+        (expand-file-name
+         (or (file-remote-p filename 'localname)
+             filename)))
     filename))
 
 (defun magit-decode-git-path (path)



reply via email to

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