From f95570c403aa073139c4b9fde5fd7c769d69fc6d Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@users.sourceforge.net>
Date: Wed, 10 Sep 2008 22:56:37 +0000
Subject: [PATCH] Frank Terbeck: 25640: another alias handling fix.

---
 ChangeLog                    | 3 +++
 Completion/Unix/Command/_git | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 62885ed36..757c08faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-09-10  Clint Adams  <clint@zsh.org>
 
+	* Frank Terbeck: 25640: Completion/Unix/Command/_git: another alias
+	handling fix.
+
 	* 25639: Src/hist.c: free ptr2 if hsubl is NULL.
 
 	* 25638: Src/Zle/compmatch.c: remove unnecessary ternary expression
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 87c43126b..13f519b91 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4286,7 +4286,7 @@ if (( CURRENT >= 3 )) && [[ -n ${git_aliases[$words[2]]} ]] ; then
   if [[ -n "${words[3,-1]}" ]] ; then
       tmpwords+=(${words[3,-1]})
   fi
-  tmpwords+=('')
+  [[ -n ${words[$CURRENT]} ]] || tmpwords+=('')
   (( CURRENT += ${#expalias} - 1 ))
   words=("${tmpwords[@]}")
   unset tmpwords expalias