completion: move --pickaxe-{all,regex} to __git_diff_common_options

The options --pickaxe-all and --pickaxe-regex are listed in
__git_diff_difftool_options and repeated in _git_log. Move them to
__git_diff_common_options instead, which makes them available
automatically in the completion of other commands referencing this
variable.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9de33ed05da4b7e200a5b479c427e6e45f4d826d..5b8e7b810c8387bbb37e9e943a3f87f6460fca08 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1763,10 +1763,12 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
                        --irreversible-delete --line-prefix --no-stat
                        --output= --output-indicator-context=
                        --output-indicator-new= --output-indicator-old=
+                       --ws-error-highlight=
+                       --pickaxe-all --pickaxe-regex
 "
 
 # Options for diff/difftool
-__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
+__git_diff_difftool_options="--cached --staged
                        --base --ours --theirs --no-index --merge-base
                        --ita-invisible-in-index --ita-visible-in-index
                        $__git_diff_common_options"
@@ -2115,7 +2117,6 @@ _git_log ()
                        --expand-tabs --expand-tabs= --no-expand-tabs
                        $merge
                        $__git_diff_common_options
-                       --pickaxe-all --pickaxe-regex
                        "
                return
                ;;