Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[git completions] Filter unreplaced $PWD

Browse source 
Otherwise this'd let the full filename through if it isn't in $PWD.
This commit is contained in:
Fabian Homborg 2018-03-14 10:55:52 +01:00
parent 3889079f48
commit 228c5c1319
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
share/completions/git.fish
View file

@ -101,8 +101,8 @@ function __fish_git_files
# The entire line is the "from" from a rename. # The entire line is the "from" from a rename.
if set -q use_next[1] if set -q use_next[1]
if contains -- $use_next $argv if contains -- $use_next $argv
string replace -- "$PWD/" "" "$root/$line" string replace -f -- "$PWD/" "" "$root/$line"
or string replace "$root/" ":/" "$root/$line" or string replace -- "$root/" ":/" "$root/$line"
end end
set -e use_next[1] set -e use_next[1]
continue continue
@ -118,7 +118,7 @@ function __fish_git_files
# Print files from the current $PWD as-is, prepend all others with ":/" (relative to toplevel in git-speak) # Print files from the current $PWD as-is, prepend all others with ":/" (relative to toplevel in git-speak)
# This is a bit simplistic but finding the lowest common directory # This is a bit simplistic but finding the lowest common directory
# and then replacing everything else in $PWD with ".." is a bit annoying # and then replacing everything else in $PWD with ".." is a bit annoying
set file (string replace -- "$PWD/" "" "$root/$file"; or string replace -- "$root/" ":/" "$root/$file") set file (string replace -f -- "$PWD/" "" "$root/$file"; or string replace -- "$root/" ":/" "$root/$file")
set -e IFS set -e IFS
# The basic status format is "XY", where X is "our" state (meaning the staging area), # The basic status format is "XY", where X is "our" state (meaning the staging area),