v2 fixes the comments from v1 and adds to new patches to improve
_git_notes() (sorry I couldn't resist)
Interdiff with what's on 'pu'
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5f7495cda3..2e30950299 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1815,7 +1815,7 @@ _git_name_rev ()
_git_notes ()
{
- local subcommands='add append copy edit list prune remove show'
+ local subcommands='add append copy edit get-ref list merge prune remove show'
local subcommand="$(__git_find_on_cmdline "$subcommands")"
case "$subcommand,$cur" in
@@ -1832,18 +1832,15 @@ _git_notes ()
;;
esac
;;
- add,--reuse-message=*|append,--reuse-message=*|\
- add,--reedit-message=*|append,--reedit-message=*)
+ *,--reuse-message=*|*,--reedit-message=*)
__git_complete_refs --cur="${cur#*=}"
;;
- prune,--*)
- __gitcomp_builtin notes_prune
- ;;
- prune,*)
- ;;
*,--*)
__gitcomp_builtin notes_$subcommand
;;
+ prune,*|get-ref,*)
+ # this command does not take a ref, do not complete it
+ ;;
*)
case "$prev" in
-m|-F)
@@ -1956,6 +1953,7 @@ _git_rebase ()
--autostash --no-autostash
--verify --no-verify
--keep-empty --root --force-rebase --no-ff
+ --rerere-autoupdate
--exec
"
Nguyễn Thái Ngọc Duy (4):
completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate
completion: simplify _git_notes
completion: complete --{reuse,reedit}-message= for all notes subcmds
completion: more subcommands in _git_notes()
contrib/completion/git-completion.bash | 25 ++++++++-----------------
parse-options.h | 4 ++--
rerere.h | 3 +--
3 files changed, 11 insertions(+), 21 deletions(-)
--
2.16.2.785.g429c04a1b9
