completion: zsh: shuffle functions around

[thirdparty/git.git] / contrib / completion / git-completion.zsh

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 4834ebc8894018daff5d4a248819306075f6a2c6..60efddb4a9fdca62881e42a980ba35b217f7bc6f 100644 (file)
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -104,11 +104,6 @@ __gitcomp_direct ()
        compadd -Q -S '' -- ${(f)1} && _ret=0
 }
 
-__gitcomp_direct_append ()
-{
-       __gitcomp_direct "$@"
-}
-
 __gitcomp_nl ()
 {
        emulate -L zsh
@@ -117,21 +112,26 @@ __gitcomp_nl ()
        compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
-__gitcomp_nl_append ()
+__gitcomp_file ()
 {
-       __gitcomp_nl "$@"
+       emulate -L zsh
+
+       compadd -f -p "${2-}" -- ${(f)1} && _ret=0
 }
 
-__gitcomp_file_direct ()
+__gitcomp_direct_append ()
 {
-       __gitcomp_file "$1" ''
+       __gitcomp_direct "$@"
 }
 
-__gitcomp_file ()
+__gitcomp_nl_append ()
 {
-       emulate -L zsh
+       __gitcomp_nl "$@"
+}
 
-       compadd -f -p "${2-}" -- ${(f)1} && _ret=0
+__gitcomp_file_direct ()
+{
+       __gitcomp_file "$1" ""
 }
 
 __git_zsh_bash_func ()