From a8ffff2cb774a83584e4467b14c41517973c5468 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Wed, 7 Nov 2012 20:59:09 +0000
Subject: users/17382: complete URLs for vim and make _remote_files more
 consistent with _files

---
 Completion/Unix/Command/_git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Completion/Unix/Command/_git')

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 88c765fb0..2c0c0b270 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5451,7 +5451,7 @@ __git_remote_repositories () {
   service= _ssh
 
   if compset -P '*:'; then
-    _remote_files --no-files -- ssh
+    _remote_files -/ -- ssh
   else
     _ssh_hosts -S:
   fi
-- 
cgit v1.2.3


From ce658b3c3c941262a0517594066b74e5ffe3c7f1 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Wed, 7 Nov 2012 21:23:06 +0000
Subject: Benjamin R. Haskell: 30737: make custom completions for git aliases
 easier

---
 ChangeLog                    | 5 ++++-
 Completion/Unix/Command/_git | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'Completion/Unix/Command/_git')

diff --git a/ChangeLog b/ChangeLog
index a6a449993..7fbcf51ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-07  Oliver Kiddle <opk@zsh.org>
 
+	* Benjamin R. Haskell: 30737: Completion/Unix/Command/_git:
+	make custom completion functions for git aliases easier
+
 	* users/17382: Completion/Unix/Type/_remote_files,
 	Completion/Unix/Command/_vim, Completion/Unix/Command/_git,
 	Completion/Unix/Type/_urls: complete URLs for vim and make
@@ -299,5 +302,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5752 $
+* $Revision: 1.5753 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 2c0c0b270..2b6a36956 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6073,7 +6073,7 @@ _git() {
     aliases=(${(f)${${${(f)"$(_call_program aliases git config --get-regexp '\^alias\.')"}#alias.}/ /$'\n'}/(#e)/$'\n'})
     (( $#aliases % 2 == 0 )) && git_aliases=($aliases)
 
-    if (( $+git_aliases[$words[2]] && !$+commands[git-$words[2]] )); then
+    if (( $+git_aliases[$words[2]] && !$+commands[git-$words[2]] && !$+functions[_git-$words[2]] )); then
       local -a tmpwords expalias
       expalias=(${(z)git_aliases[$words[2]]})
       tmpwords=(${words[1]} ${expalias})
-- 
cgit v1.2.3