rootiest/fish-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: rootiest/fish-config:d2e7c799c46706592a29c22fad71fccd805e81f2
Branches Tags
rootiest/fish-config:main
..
compare: rootiest/fish-config:be051daf1e5bb77e1bb067243baef190090f6101
Branches Tags
rootiest/fish-config:main

2 Commits
d2e7c799c4 .. be051daf1e

Author SHA1 Message Date
rootiest be051daf1e Merge pull request 'fix(zoxide): restore CDPATH support in cd/z execution' (#14) from fix/cdpath-cd-execution into main 
Reviewed-on: #14
 2026-05-12 04:45:47 +00:00
rootiest 05139354cf fix(zoxide): restore CDPATH support in cd/z execution 
The CDPATH regression was introduced when unifying completions: the `z`
function only checked `test -d` (absolute path existence) before falling
through to zoxide query, silently ignoring CDPATH-relative directories.
Now mirrors the completion logic — checks direct path, then each CDPATH
prefix, then zoxide — so `cd subdir` resolves correctly when `subdir`
lives under a CDPATH entry.
 2026-05-12 00:43:59 -04:00
1 changed files with 19 additions and 4 deletions
Expand all files Collapse all files
conf.d/zoxide.fish
+17 -2
View File
@@ -33,13 +33,28 @@ if status is-interactive
_zoxide_cd $HOME _zoxide_cd $HOME
else if test "$argv" = - else if test "$argv" = -
_zoxide_cd - _zoxide_cd -
else if test -d $argv[-1] else
# Check if the argument is a directory (respecting CDPATH)
set -l is_dir 1
if test -d $argv[-1]
set is_dir 0
else if not string match -rq '^\.?\.?/' -- $argv[-1]
for i in $CDPATH
if test -n "$i" -a -d "$i/$argv[-1]"
set is_dir 0
break
end
end
end
if test $is_dir -eq 0
_zoxide_cd $argv[-1] _zoxide_cd $argv[-1]
else else
set -l result (command zoxide query $argv) set -l result (command zoxide query -- $argv)
and _zoxide_cd $result and _zoxide_cd $result
end end
end end
end
function zi function zi
set -l result (command zoxide query -i -- $argv) set -l result (command zoxide query -i -- $argv)