mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-options: option to let --git-completion-helper show negative form

Browse Source 
When 7fb6aefd2a (Merge branch 'nd/parseopt-completion' - 2018-03-14)
is merged, the completion for negative form is left out because the
series is alread long and it could be done in a follow up series. This
is it.

--git-completion-helper now provides --no-xxx so that git-completion.bash
can drop the extra custom --no-xxx in the script. It adds a lot more
--no-xxx than what's current provided by the git-completion.bash
script. We'll trim that down later.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-05-27 10:38:26 +02:00
committed by Junio C Hamano
parent e144d126d7
commit 2b1c01d22e
3 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
contrib/completion/git-completion.bash
View File

@ -1126,7 +1126,7 @@ _git_am ()
return
;;
--*)
__gitcomp_builtin am "--no-utf8" \
__gitcomp_builtin am "" \
"$__git_am_inprogress_options"
return
esac
@ -1226,9 +1226,7 @@ _git_branch ()
__git_complete_refs --cur="${cur##--set-upstream-to=}"
;;
--*)
__gitcomp_builtin branch "--no-color --no-abbrev
--no-track --no-column
"
__gitcomp_builtin branch
;;
*)
if [ $only_local_ref = "y" -a $has_r = "n" ]; then
@ -1269,7 +1267,7 @@ _git_checkout ()
__gitcomp "diff3 merge" "" "${cur##--conflict=}"
;;
--*)
__gitcomp_builtin checkout "--no-track --no-recurse-submodules"
__gitcomp_builtin checkout
;;
*)
# check if --track, --no-track, or --no-guess was specified
@ -1332,7 +1330,7 @@ _git_clone ()
{
case "$cur" in
--*)
__gitcomp_builtin clone "--no-single-branch"
__gitcomp_builtin clone
return
;;
esac
@ -1365,7 +1363,7 @@ _git_commit ()
return
;;
--*)
__gitcomp_builtin commit "--no-edit --verify"
__gitcomp_builtin commit
return
esac
@ -1468,7 +1466,7 @@ _git_fetch ()
return
;;
--*)
__gitcomp_builtin fetch "--no-tags"
__gitcomp_builtin fetch
return
;;
esac
@ -1505,7 +1503,7 @@ _git_fsck ()
{
case "$cur" in
--*)
__gitcomp_builtin fsck "--no-reflogs"
__gitcomp_builtin fsck
return
;;
esac
@ -1612,7 +1610,7 @@ _git_ls_files ()
{
case "$cur" in
--*)
__gitcomp_builtin ls-files "--no-empty-directory"
__gitcomp_builtin ls-files
return
;;
esac
@ -1763,12 +1761,7 @@ _git_merge ()
case "$cur" in
--*)
__gitcomp_builtin merge "--no-rerere-autoupdate
--no-commit --no-edit --no-ff
--no-log --no-progress
--no-squash --no-stat
--no-verify-signatures
"
__gitcomp_builtin merge
return
esac
__git_complete_refs
@ -1867,10 +1860,7 @@ _git_pull ()
return
;;
--*)
__gitcomp_builtin pull "--no-autostash --no-commit --no-edit
--no-ff --no-log --no-progress --no-rebase
--no-squash --no-stat --no-tags
--no-verify-signatures"
__gitcomp_builtin pull
return
;;
@ -2061,7 +2051,7 @@ _git_status ()
return
;;
--*)
__gitcomp_builtin status "--no-column"
__gitcomp_builtin status
return
;;
esac
@ -2615,7 +2605,7 @@ _git_remote ()
case "$subcommand,$cur" in
add,--*)
__gitcomp_builtin remote_add "--no-tags"
__gitcomp_builtin remote_add
;;
add,*)
;;
@ -2695,7 +2685,7 @@ _git_revert ()
fi
case "$cur" in
--*)
__gitcomp_builtin revert "--no-edit" \
__gitcomp_builtin revert "" \
"$__git_revert_inprogress_options"
return
;;
@ -2765,7 +2755,7 @@ _git_show_branch ()
{
case "$cur" in
--*)
__gitcomp_builtin show-branch "--no-color"
__gitcomp_builtin show-branch
return
;;
esac