bash: refactor 'git log --pretty=<format>' options

Both 'git log' and 'show' have the same '--pretty=<format>' option
with the same formats.  So refactor these formats into a common
variable.

While at it, also add 'format:' to the list.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 80edfcacc969986047a27d83df32cc662c9f12f9..ec701e8069e995e50aa1acb3c78832bc525272f0 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -947,6 +947,8 @@ _git_ls_tree ()
        __git_complete_file
 }
 
        __git_complete_file
 }
 

+__git_log_pretty_formats="oneline short medium full fuller email raw format:"
+

 _git_log ()
 {
        __git_has_doubledash && return
 _git_log ()
 {
        __git_has_doubledash && return


@@ -954,8 +956,7 @@ _git_log ()
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)

-               __gitcomp "
-                       oneline short medium full fuller email raw
+               __gitcomp "$__git_log_pretty_formats

                        " "" "${cur##--pretty=}"
                return
                ;;
                        " "" "${cur##--pretty=}"
                return
                ;;


@@ -1483,8 +1484,7 @@ _git_show ()
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)

-               __gitcomp "
-                       oneline short medium full fuller email raw
+               __gitcomp "$__git_log_pretty_formats

                        " "" "${cur##--pretty=}"
                return
                ;;
                        " "" "${cur##--pretty=}"
                return
                ;;