bash completion: refactor diff options

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@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b5d3bbbceb4301132e565001cc8e23ce611a7f7d..a1298c4f9684a014067ba89a74977f48ac3e7bb9 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -773,14 +773,7 @@ _git_describe ()
        __gitcomp "$(__git_refs)"
 }
 
        __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=
                        --patch-with-stat --name-only --name-status --color
                        --no-color --color-words --no-renames --check
                        --full-index --binary --abbrev --diff-filter=


@@ -789,8 +782,20 @@ _git_diff ()
                        --ignore-all-space --exit-code --quiet --ext-diff
                        --no-ext-diff
                        --no-prefix --src-prefix= --dst-prefix=
                        --ignore-all-space --exit-code --quiet --ext-diff
                        --no-ext-diff
                        --no-prefix --src-prefix= --dst-prefix=

-                       --base --ours --theirs

                        --inter-hunk-context=
                        --inter-hunk-context=

+                       --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
                ;;
                        "
                return
                ;;


@@ -976,16 +981,15 @@ _git_log ()
                        --relative-date --date=
                        --author= --committer= --grep=
                        --all-match
                        --relative-date --date=
                        --author= --committer= --grep=
                        --all-match

-                       --pretty= --name-status --name-only --raw
+                       --pretty=

                        --not --all
                        --left-right --cherry-pick
                        --graph
                        --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
                        --parents --children --full-history
                        --merge

-                       --inter-hunk-context=
+                       $__git_diff_common_options

                        --pickaxe-all --pickaxe-regex
                        "
                return
                        --pickaxe-all --pickaxe-regex
                        "
                return


@@ -1490,7 +1494,9 @@ _git_show ()
                return
                ;;
        --*)
                return
                ;;
        --*)

-               __gitcomp "--pretty="
+               __gitcomp "--pretty=
+                       $__git_diff_common_options
+                       "

                return
                ;;
        esac
                return
                ;;
        esac