Merge branch 'sg/completion'

* sg/completion:
bash: support pretty format aliases
bash: support more 'git notes' subcommands and their options
bash: not all 'git bisect' subcommands make sense when not bisecting
bash: offer refs for 'git bisect start'

diff --combined contrib/completion/git-completion.bash
index 168669bbf79cb33c527a688fb906e276beadaf79,9a6317de69c242ea29271be36a4e3f9878493271..b8f2125ff7d84aa011589b264639396e87489666
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -21,11 -21,6 +21,11 @@@
  #    2) Added the following line to your .bashrc:
  #        source ~/.git-completion.sh
  #
 +#       Or, add the following lines to your .zshrc:
 +#        autoload bashcompinit
 +#        bashcompinit
 +#        source ~/.git-completion.sh
 +#
  #    3) Consider changing your PS1 to also show the current branch:
  #        PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
  #
@@@ -143,12 -138,11 +143,12 @@@ __git_ps1_show_upstream (
                # get the upstream from the "git-svn-id: ..." in a commit message
                # (git-svn uses essentially the same procedure internally)
                local svn_upstream=($(git log --first-parent -1 \
 -                                      --grep="^git-svn-id: \(${svn_url_pattern:2}\)" 2>/dev/null))
 +                                      --grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
                if [[ 0 -ne ${#svn_upstream[@]} ]]; then
                        svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
                        svn_upstream=${svn_upstream%@*}
 -                      for ((n=1; "$n" <= "${#svn_remote[@]}"; ++n)); do
 +                      local n_stop="${#svn_remote[@]}"
 +                      for ((n=1; n <= n_stop; ++n)); do
                                svn_upstream=${svn_upstream#${svn_remote[$n]}}
                        done
  
@@@ -756,6 -750,19 +756,19 @@@ __git_compute_porcelain_commands (
        : ${__git_porcelain_commands:=$(__git_list_porcelain_commands)}
  }
  
+ __git_pretty_aliases ()
+ {
+       local i IFS=$'\n'
+       for i in $(git --git-dir="$(__gitdir)" config --get-regexp "pretty\..*" 2>/dev/null); do
+               case "$i" in
+               pretty.*)
+                       i="${i#pretty.}"
+                       echo "${i/ */}"
+                       ;;
+               esac
+       done
+ }
+ 
  __git_aliases ()
  {
        local i IFS=$'\n'
@@@ -913,12 -920,16 +926,16 @@@ _git_bisect (
        local subcommands="start bad good skip reset visualize replay log run"
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
-               __gitcomp "$subcommands"
+               if [ -f "$(__gitdir)"/BISECT_START ]; then
+                       __gitcomp "$subcommands"
+               else
+                       __gitcomp "replay start"
+               fi
                return
        fi
  
        case "$subcommand" in
-       bad|good|reset|skip)
+       bad|good|reset|skip|start)
                __gitcomp "$(__git_refs)"
                ;;
        *)
@@@ -1374,12 -1385,12 +1391,12 @@@ _git_log (
        fi
        case "$cur" in
        --pretty=*)
-               __gitcomp "$__git_log_pretty_formats
+               __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
                        " "" "${cur##--pretty=}"
                return
                ;;
        --format=*)
-               __gitcomp "$__git_log_pretty_formats
+               __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
                        " "" "${cur##--format=}"
                return
                ;;
@@@ -1474,18 -1485,50 +1491,50 @@@ _git_name_rev (
  
  _git_notes ()
  {
-       local subcommands="edit show"
-       if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
-               __gitcomp "$subcommands"
-               return
-       fi
+       local subcommands='add append copy edit list prune remove show'
+       local subcommand="$(__git_find_on_cmdline "$subcommands")"
+       local cur="${COMP_WORDS[COMP_CWORD]}"
  
-       case "${COMP_WORDS[COMP_CWORD-1]}" in
-       -m|-F)
-               COMPREPLY=()
+       case "$subcommand,$cur" in
+       ,--*)
+               __gitcomp '--ref'
+               ;;
+       ,*)
+               case "${COMP_WORDS[COMP_CWORD-1]}" in
+               --ref)
+                       __gitcomp "$(__git_refs)"
+                       ;;
+               *)
+                       __gitcomp "$subcommands --ref"
+                       ;;
+               esac
+               ;;
+       add,--reuse-message=*|append,--reuse-message=*)
+               __gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}"
+               ;;
+       add,--reedit-message=*|append,--reedit-message=*)
+               __gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}"
+               ;;
+       add,--*|append,--*)
+               __gitcomp '--file= --message= --reedit-message=
+                               --reuse-message='
+               ;;
+       copy,--*)
+               __gitcomp '--stdin'
+               ;;
+       prune,--*)
+               __gitcomp '--dry-run --verbose'
+               ;;
+       prune,*)
                ;;
        *)
-               __gitcomp "$(__git_refs)"
+               case "${COMP_WORDS[COMP_CWORD-1]}" in
+               -m|-F)
+                       ;;
+               *)
+                       __gitcomp "$(__git_refs)"
+                       ;;
+               esac
                ;;
        esac
  }
@@@ -2106,12 -2149,12 +2155,12 @@@ _git_show (
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)
-               __gitcomp "$__git_log_pretty_formats
+               __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
                        " "" "${cur##--pretty=}"
                return
                ;;
        --format=*)
-               __gitcomp "$__git_log_pretty_formats
+               __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
                        " "" "${cur##--format=}"
                return
                ;;
@@@ -2345,11 -2388,6 +2394,11 @@@ _git (
  {
        local i c=1 command __git_dir
  
 +      if [[ -n ${ZSH_VERSION-} ]]; then
 +              emulate -L bash
 +              setopt KSH_TYPESET
 +      fi
 +
        while [ $c -lt $COMP_CWORD ]; do
                i="${COMP_WORDS[c]}"
                case "$i" in
@@@ -2383,22 -2421,17 +2432,22 @@@
        fi
  
        local completion_func="_git_${command//-/_}"
 -      declare -F $completion_func >/dev/null && $completion_func && return
 +      declare -f $completion_func >/dev/null && $completion_func && return
  
        local expansion=$(__git_aliased_command "$command")
        if [ -n "$expansion" ]; then
                completion_func="_git_${expansion//-/_}"
 -              declare -F $completion_func >/dev/null && $completion_func
 +              declare -f $completion_func >/dev/null && $completion_func
        fi
  }
  
  _gitk ()
  {
 +      if [[ -n ${ZSH_VERSION-} ]]; then
 +              emulate -L bash
 +              setopt KSH_TYPESET
 +      fi
 +
        __git_has_doubledash && return
  
        local cur="${COMP_WORDS[COMP_CWORD]}"
@@@ -2433,29 -2466,3 +2482,29 @@@ if [ Cygwin = "$(uname -o 2>/dev/null)
  complete -o bashdefault -o default -o nospace -F _git git.exe 2>/dev/null \
        || complete -o default -o nospace -F _git git.exe
  fi
 +
 +if [[ -n ${ZSH_VERSION-} ]]; then
 +      shopt () {
 +              local option
 +              if [ $# -ne 2 ]; then
 +                      echo "USAGE: $0 (-q|-s|-u) <option>" >&2
 +                      return 1
 +              fi
 +              case "$2" in
 +              nullglob)
 +                      option="$2"
 +                      ;;
 +              *)
 +                      echo "$0: invalid option: $2" >&2
 +                      return 1
 +              esac
 +              case "$1" in
 +              -q)     setopt | grep -q "$option" ;;
 +              -u)     unsetopt "$option" ;;
 +              -s)     setopt "$option" ;;
 +              *)
 +                      echo "$0: invalid flag: $1" >&2
 +                      return 1
 +              esac
 +      }
 +fi