From 84b765eab9d645a1c9185b6ed311e5bf821212ba Mon Sep 17 00:00:00 2001
From: Josh Hagins <hagins.josh@gmail.com>
Date: Tue, 20 Jan 2015 22:21:39 -0500
Subject: [PATCH] Fix argument expansion in __git_alias

---
 lib/git/aliases.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index e2d0d1a..c7f8fc6 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -64,11 +64,11 @@ _git
 # Usage: __git_alias <alias> <command_prefix> <command>
 __git_alias () {
   if [ -n "$1" ]; then
-    local alias_str="$1"; local cmd_prefix="$2"; local cmd="$3"; local cmd_args="${4-}"
-    alias $alias_str="$cmd_prefix $cmd${cmd_args:+ }$cmd_args"
+    local alias_str="$1"; local cmd_prefix="$2"; local cmd="$3"; local cmd_args=("${@:4}")
+    alias $alias_str="$cmd_prefix $cmd${cmd_args:+ }${cmd_args[*]}"
     if [ "$shell" = "bash" ]; then
-      __define_git_completion $alias_str $cmd
-      complete -o default -o nospace -F _git_"$alias_str"_shortcut $alias_str
+      __define_git_completion "$alias_str" "$cmd"
+      complete -o default -o nospace -F _git_"$alias_str"_shortcut "$alias_str"
     fi
   fi
 }