diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:28 -0700 |
| commit | 04ce89389d37097da250c9879bddc9f59443a704 (patch) | |
| tree | ae8d71cb03df34f91a2709008df1d0be6ad206f9 | |
| parent | 6af984043f121d2f80aeb837c0b2259ad254a829 (diff) | |
| parent | 66fb37d0c62ef49c9d3506b10d2d7f5b33008484 (diff) | |
| download | git-04ce89389d37097da250c9879bddc9f59443a704.tar.gz | |
Merge branch 'jk/bash-completion'
* jk/bash-completion:
completion: learn about --man-path
completion: handle unstuck form of base git options
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ebc40d4845..fa3ae1e853 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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= diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 5469dee8d1..d9e3103af5 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -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= |