From 404ab5e9ab2ba2f0eb9df797993524348b95d586 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sat, 30 Apr 2016 16:30:02 +0200 Subject: [PATCH] git completion: Allow optional "+" for push This signifies a force-push. To avoid cluttering, only complete branches if a + is already given. Fixes #2879. (cherry picked from commit fde26d404956f843860f2bf5bb00dd3e1636632a) --- share/completions/git.fish | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/completions/git.fish b/share/completions/git.fish index a6bce22d0..e4e0ba36b 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -417,7 +417,10 @@ complete -f -c git -n '__fish_git_using_command pull; and __fish_git_branch_for_ ### push complete -f -c git -n '__fish_git_needs_command' -a push -d 'Update remote refs along with associated objects' complete -f -c git -n '__fish_git_using_command push; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote alias' +# The "refspec" here is an optional "+" to signify a force-push (implemented) +# then src:dest (where both src and dest are git objects, so we most likely want to complete branches (not implemented) complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote' -a '(__fish_git_branches)' -d 'Branch' +complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "+*" -- (commandline -ct)' -a '+(__fish_git_branches)' -d 'Force-push branch' complete -f -c git -n '__fish_git_using_command push' -l all -d 'Push all refs under refs/heads/' complete -f -c git -n '__fish_git_using_command push' -l prune -d "Remove remote branches that don't have a local counterpart" complete -f -c git -n '__fish_git_using_command push' -l mirror -d 'Push all refs under refs/'