diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2008-09-10 22:56:37 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2008-09-10 22:56:37 +0000 |
| commit | f95570c403aa073139c4b9fde5fd7c769d69fc6d (patch) | |
| tree | b3ce842c124365eaec27637b5d49301f80c33503 | |
| parent | b62584cbcd7dbbb740b9420e37f34ee1b2e8ff18 (diff) | |
| download | zsh-f95570c403aa073139c4b9fde5fd7c769d69fc6d.tar.gz zsh-f95570c403aa073139c4b9fde5fd7c769d69fc6d.tar.xz zsh-f95570c403aa073139c4b9fde5fd7c769d69fc6d.zip | |
Frank Terbeck: 25640: another alias handling fix.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 4 insertions, 1 deletions
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 |