undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rk/completion-stash'

Browse Source 
The command line completion script (in contrib/) learned that "git
stash show" takes the options "git diff" takes.

* rk/completion-stash:
  git-completion.bash: stash-show: complete $__git_diff_common_options
  git-completion.bash: __git_diff_common_options: add --[no-]patch
This commit is contained in:
Junio C Hamano 2020-10-27 15:09:46 -07:00
commit a4adb60583
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1688,6 +1688,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--submodule --submodule= --ignore-submodules --submodule --submodule= --ignore-submodules
--indent-heuristic --no-indent-heuristic --indent-heuristic --no-indent-heuristic
--textconv --no-textconv --textconv --no-textconv
--patch --no-patch
" "
_git_diff () _git_diff ()
@ -2031,11 +2032,9 @@ _git_log ()
--no-walk --no-walk= --do-walk --no-walk --no-walk= --do-walk
--parents --children --parents --children
--expand-tabs --expand-tabs= --no-expand-tabs --expand-tabs --expand-tabs= --no-expand-tabs
--patch
$merge $merge
$__git_diff_common_options $__git_diff_common_options
--pickaxe-all --pickaxe-regex --pickaxe-all --pickaxe-regex
--patch --no-patch
" "
return return
;; ;;
@ -2938,7 +2937,7 @@ _git_show ()
;; ;;
--*) --*)
__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
--oneline --show-signature --patch --oneline --show-signature
--expand-tabs --expand-tabs= --no-expand-tabs --expand-tabs --expand-tabs= --no-expand-tabs
$__git_diff_common_options $__git_diff_common_options
" "
@ -3021,7 +3020,10 @@ _git_stash ()
list,--*) list,--*)
__gitcomp "--name-status --oneline --patch-with-stat" __gitcomp "--name-status --oneline --patch-with-stat"
;; ;;
show,--*|branch,--*) show,--*)
__gitcomp "$__git_diff_common_options"
;;
branch,--*)
;; ;;
branch,*) branch,*)
if [ $cword -eq 3 ]; then if [ $cword -eq 3 ]; then