Thomas Rast <trast@xxxxxxxxxxxxxxx> writes:
> diff, log and show all take the same diff options. Refactor them from
> __git_diff and __git_log into a variable, and complete them in
> __git_show too.
>
> Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
>
> ---
> contrib/completion/git-completion.bash | 36 ++++++++++++++++++-------------
> 1 files changed, 21 insertions(+), 15 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 096603b..bfae953 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -773,14 +773,7 @@ _git_describe ()
> __gitcomp "$(__git_refs)"
> }
>
> -_git_diff ()
> -{
> - __git_has_doubledash && return
> -
> - local cur="${COMP_WORDS[COMP_CWORD]}"
> - case "$cur" in
> - --*)
> - __gitcomp "--cached --stat --numstat --shortstat --summary
> +__git_diff_common_options="--stat --numstat --shortstat --summary
> --patch-with-stat --name-only --name-status --color
> --no-color --color-words --no-renames --check
> --full-index --binary --abbrev --diff-filter=
> @@ -789,9 +782,21 @@ _git_diff ()
> --ignore-all-space --exit-code --quiet --ext-diff
> --no-ext-diff
> --no-prefix --src-prefix= --dst-prefix=
> - --base --ours --theirs
> --inter-hunk-context=
> --patience
> + --raw
> +"
> +
> +_git_diff ()
> +{
> + __git_has_doubledash && return
> +
> + local cur="${COMP_WORDS[COMP_CWORD]}"
> + case "$cur" in
> + --*)
> + __gitcomp "--cached --pickaxe-all --pickaxe-regex
> + --base --ours --theirs
> + $__git_diff_common_options
> "
> return
> ;;
> @@ -977,17 +982,16 @@ _git_log ()
> --relative-date --date=
> --author= --committer= --grep=
> --all-match
> - --pretty= --name-status --name-only --raw
> + --pretty=
> --not --all
> --left-right --cherry-pick
> --graph
> - --stat --numstat --shortstat
> - --decorate --diff-filter=
> - --color-words --walk-reflogs
> + --decorate
> + --walk-reflogs
> --parents --children --full-history
> --merge
> --inter-hunk-context=
> - --patience
> + $__git_diff_common_options
> --pickaxe-all --pickaxe-regex
> "
I'll tweak this part to drop duplicated --ihc; other than that it looked
good. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
