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 completion: Fix option-before-command for stash

Browse source 
Because it allows sub-subcommands, it has functions to determine which,
if any, is used. These were too simplistic.
This commit is contained in:
Fabian Homborg 2016-05-11 14:57:56 +02:00
parent d2e79cf6f6
commit b60ef72c3d
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
share/completions/git.fish
View file

@ -115,21 +115,22 @@ function __fish_git_using_command
end
function __fish_git_stash_using_command
set cmd (commandline -opc)
if [ (count $cmd) -gt 2 ]
if [ $cmd[2] = 'stash' -a $argv[1] = $cmd[3] ]
return 0
end
end
return 1
set cmd (commandline -opc)
__fish_git_using_command stash; or return 2
# The word after the stash command _must_ be the subcommand
set cmd $cmd[(contains -i -- "stash" $cmd)..-1]
set -e cmd[1]
set -q cmd[1]; or return 1
contains -- $cmd[1] $argv; and return 0
return 1
end
function __fish_git_stash_not_using_subcommand
set cmd (commandline -opc)
if [ (count $cmd) -gt 2 -a $cmd[2] = 'stash' ]
return 1
end
return 0
set cmd (commandline -opc)
__fish_git_using_command stash; or return 2
set cmd $cmd[(contains -i -- "stash" $cmd)..-1]
set -q cmd[2]; and return 1
return 0
end
function __fish_git_complete_stashes