mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jk/bash-completion'
* jk/bash-completion: completion: learn about --man-path completion: handle unstuck form of base git options
This commit is contained in:
commit
04ce89389d
|
@ -2490,9 +2490,10 @@ __git_main ()
|
|||
i="${words[c]}"
|
||||
case "$i" in
|
||||
--git-dir=*) __git_dir="${i#--git-dir=}" ;;
|
||||
--git-dir) ((c++)) ; __git_dir="${words[c]}" ;;
|
||||
--bare) __git_dir="." ;;
|
||||
--help) command="help"; break ;;
|
||||
-c) c=$((++c)) ;;
|
||||
-c|--work-tree|--namespace) ((c++)) ;;
|
||||
-*) ;;
|
||||
*) command="$i"; break ;;
|
||||
esac
|
||||
|
@ -2510,6 +2511,7 @@ __git_main ()
|
|||
--exec-path
|
||||
--exec-path=
|
||||
--html-path
|
||||
--man-path
|
||||
--info-path
|
||||
--work-tree=
|
||||
--namespace=
|
||||
|
|
|
@ -365,6 +365,7 @@ test_expect_success 'double dash "git" itself' '
|
|||
--exec-path Z
|
||||
--exec-path=
|
||||
--html-path Z
|
||||
--man-path Z
|
||||
--info-path Z
|
||||
--work-tree=
|
||||
--namespace=
|
||||
|
|
Loading…
Reference in a new issue