Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[git completions] Make paths not in $PWD relative to the root again

Browse source 
When git prints a path like "share/completions/git.fish", that's
relative to the root of the repo. So we need to either remove
everything from the $PWD (if the path is inside the $PWD), or prepend
a ":/", which is git-speak for "relative to the root".

This was removed by mistake in the recent switch to `git status`.

Fixes #4688.
This commit is contained in:
Fabian Homborg 2018-01-29 19:05:42 +01:00
parent 4fac2f98c2
commit 0ab437be26
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
share/completions/git.fish
View file

@ -83,6 +83,9 @@ function __fish_git_files
# and as a convenience "all-staged" # and as a convenience "all-staged"
# to get _all_ kinds of staged files. # to get _all_ kinds of staged files.
# Save the repo root to remove it from the path later.
set -l root (command git rev-parse --show-toplevel ^/dev/null)
# git status --porcelain gives us all the info we need, in a format we don't. # git status --porcelain gives us all the info we need, in a format we don't.
# The v2 format has better documentation and doesn't use " " to denote anything, # The v2 format has better documentation and doesn't use " " to denote anything,
# but it's only been added in git 2.11.0, which was released November 2016. # but it's only been added in git 2.11.0, which was released November 2016.
@ -98,7 +101,7 @@ 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]
contains -- $use_next $argv contains -- $use_next $argv
and echo "$line" and string replace -- "$PWD/" "" "$root/$line" | string replace "$root/" ":/"
set -e use_next[1] set -e use_next[1]
continue continue
end end
@ -110,6 +113,9 @@ function __fish_git_files
set -l IFS set -l IFS
set -l stat (string sub -l 2 -- $line) set -l stat (string sub -l 2 -- $line)
set -l file (string sub -s 4 -- $line) set -l file (string sub -s 4 -- $line)
# 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 and then replacing everything else in $PWD with ".." is a bit annoying
set file (string replace -- "$PWD/" "" "$root/$file" | string replace "$root/" ":/")
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),