Skip to content

Commit 2c2b34d

Browse files
committed
magit-file-{ignore,tracked}-p: Convert filename for git
Closes #4966.
1 parent eba1e85 commit 2c2b34d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lisp/magit-files.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ Git, fallback to using `rename-file'."
431431
(user-error "%s already exists" dstfile))
432432
(unless (file-exists-p dstdir)
433433
(user-error "Destination directory %s does not exist" dstdir))
434-
(if (magit-file-tracked-p (magit-convert-filename-for-git file))
434+
(if (magit-file-tracked-p file)
435435
(magit-call-git "mv"
436436
(magit-convert-filename-for-git file)
437437
(magit-convert-filename-for-git newname))

lisp/magit-git.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,10 +1074,11 @@ tracked file."
10741074

10751075
(defun magit-file-ignored-p (file)
10761076
(magit-git-string-p "ls-files" "--others" "--ignored" "--exclude-standard"
1077-
"--" file))
1077+
"--" (magit-convert-filename-for-git file)))
10781078

10791079
(defun magit-file-tracked-p (file)
1080-
(magit-git-success "ls-files" "--error-unmatch" "--" file))
1080+
(magit-git-success "ls-files" "--error-unmatch"
1081+
"--" (magit-convert-filename-for-git file)))
10811082

10821083
(defun magit-list-files (&rest args)
10831084
(apply #'magit-git-items "ls-files" "-z" "--full-name" args))

0 commit comments

Comments
 (0)