Cleanup and performance improvements

bash_completion

@@ -16,24 +16,32 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # #
 
-__git-short_cmdok ()
+
+__git-short_cmdok()
 {
-  test "${1:0:1}" != -
+  local -r cmd="$1"
+  test "${cmd:0:1}" != -
 }
 
-__git-short_docomplete ()
+
+__git-short_docomplete()
 {
+  local -r cmd="$1" fn="$2"
+
   # ignore problem commands
-  __git-short_cmdok "$1" || return
+  __git-short_cmdok "$cmd" || return
 
-  complete -o bashdefault -o default -o nospace -F $2 $1 2>/dev/null \
-    || complete -o default -o nospace -F $2 $1
+  complete -o bashdefault -o default -o nospace -F"$fn" "$cmd" 2>/dev/null \
+    || complete -o default -o nospace -F"$fn" "$cmd"
 }
 
-__git-short_shortmap ()
+
+__git-short_shortmap()
 {
+  local -r shortcmd="$1"
+
   # only perform completion when within a git dir
-  __gitdir >/dev/null || return $?
+  __gitdir >/dev/null || return
 
   # populate variables used by various git completion functions
   local cur words cword prev
@@ -41,64 +49,76 @@ __git-short_shortmap ()
 
   # execute the associated completion function (column two of the shortmaps
   # file)
-  $( awk "/^$1 / { print \$2 }" <<< "$__git_short_maps" )
+  "${__git_short_comp[$shortcmd]}"
 }
 
-__git-short_register_alias ()
+
+__git-short_register_alias()
 {
+  local -r cmd="$1"
+
   # ignore invalid aliases (for which we define functions to handle them
   # instead)
-  __git-short_cmdok "$1" || return
+  __git-short_cmdok "$cmd" || return
 
-  alias $1="__git-short_shortalias $1"
+  alias $cmd="__git-short_shortalias '$cmd'"
 }
 
-__git-short_shortalias ()
+
+__git-short_shortalias()
 {
-  shortcmd=$1
+  local -r shortcmd="$1"
   shift
 
-  # if we're not within a git dir, fall back to an actual command of this name
+  # if we're not within a git dir, fall back to an actual command of this
+  # name
   __gitdir >/dev/null || {
-    " $shortcmd $@"
-    return $?
+    command "$shortcmd" "$@"
+    return
   }
 
-  # execute the command
-  cmd="$( grep "^$shortcmd " <<< "$__git_short_maps" | cut -d' ' -f3- )"
-  if [ -z "$cmd" ]; then
+  local cmd="${__git_short_maps[$shortcmd]}"
+  test -n "$cmd" || return
+
+  # pipe cmd prefix indicates a verbatim command
+  if [ "${cmd:0:1}" == '|' ]; then
+    eval "${cmd:1}" '"$@"'
     return
-  elif grep -q '^|' <<< "$cmd"; then
-    eval "$( sed 's/^|//' <<< "$cmd" ) $@"
-    return $?
   fi
 
+  # intentionally unquoted
   $cmd "$@"
 }
 
+
+# load shortmaps from cwd (or provided path) and home dir (if available)
+__git-short_load_maps()
+{
+  local -r path="${1:-./shortmaps}"
+  cat "$path" ~/.git-shortmaps 2>/dev/null
+}
+
+
 # functions that cannot be aliased
 - () { __git-short_shortalias - "$@"; }
 -- () { __git-short_shortalias -- "$@"; }
 
-# load shortmaps from cwd (or provided path) and home dir (if available)
-__git_short_maps=$(
-  cat ${1:-./shortmaps} ~/.git-shortmaps 2>/dev/null \
-    | sed 's/^\([^ ]\+ [^ ]\+\) :/\1 git /'
-)
 
-oldifs="$IFS"
+declare shortcmd comp cmd
+declare -A __git_short_maps=() __git_short_comp=()
 
 # register each shortmap
-IFS=$'\n'
-for line in $__git_short_maps; do
-  IFS=$' '
-  set -- $line
+while read shortcmd comp cmd; do
+  test -n "$shortcmd" || continue
 
-  [ -z "$1" ] && continue
-  __git-short_docomplete "$1" __git-short_shortmap
+  if [ "${cmd:0:1}" == : ]; then
+    cmd="git ${cmd:1}"
+  fi
 
-  __git-short_docomplete "$1" __git-short_shortmap
-  __git-short_register_alias "$1"
-done
+  __git_short_maps["$shortcmd"]="$cmd"
+  __git_short_comp["$shortcmd"]="$comp"
+
+  __git-short_docomplete "$shortcmd" __git-short_shortmap
+  __git-short_register_alias "$shortcmd"
+done < <( __git-short_load_maps "$1" )
 
-IFS="$oldifs"