diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-15 07:20:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-16 06:31:01 (GMT) |
| commit | 9013192449ed1148da4805e33a2644fca92dd1c7 (patch) | |
| tree | 1e4e01c573cdf2222706693822916995f97196a0 /contrib/completion | |
| parent | 3a79347862f9864e580af2b9daeebac28be9c7a6 (diff) | |
| download | git-9013192449ed1148da4805e33a2644fca92dd1c7.zip git-9013192449ed1148da4805e33a2644fca92dd1c7.tar.gz git-9013192449ed1148da4805e33a2644fca92dd1c7.tar.bz2 | |
Teach bash the new features of 'git show'.
Now that 'git show' accepts ref:path as an argument to specify a
tree or blob we should use the same completion logic as we support
for cat-file's object identifier.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 9c4d23a..234cd09 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -752,6 +752,24 @@ _git_reset () COMPREPLY=($(compgen -W "$opt $(__git_refs)" -- "$cur")) } +_git_show () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + case "$cur" in + --pretty=*) + COMPREPLY=($(compgen -W " + oneline short medium full fuller email raw + " -- "${cur##--pretty=}")) + return + ;; + --*) + COMPREPLY=($(compgen -W "--pretty=" -- "$cur")) + return + ;; + esac + __git_complete_file +} + _git () { local i c=1 command __git_dir @@ -802,7 +820,7 @@ _git () rebase) _git_rebase ;; repo-config) _git_repo_config ;; reset) _git_reset ;; - show) _git_log ;; + show) _git_show ;; show-branch) _git_log ;; whatchanged) _git_log ;; *) COMPREPLY=() ;; @@ -839,7 +857,7 @@ complete -o default -o nospace -F _git_push git-push complete -o default -F _git_rebase git-rebase complete -o default -F _git_repo_config git-repo-config complete -o default -F _git_reset git-reset -complete -o default -F _git_log git-show +complete -o default -o nospace -F _git_show git-show complete -o default -o nospace -F _git_log git-show-branch complete -o default -o nospace -F _git_log git-whatchanged @@ -861,7 +879,7 @@ complete -o default -F _git_merge_base git-merge-base.exe complete -o default -F _git_name_rev git-name-rev.exe complete -o default -o nospace -F _git_push git-push.exe complete -o default -F _git_repo_config git-repo-config -complete -o default -o nospace -F _git_log git-show.exe +complete -o default -o nospace -F _git_show git-show.exe complete -o default -o nospace -F _git_log git-show-branch.exe complete -o default -o nospace -F _git_log git-whatchanged.exe fi |