From 6540e8d8cffba3e29c0adbdd28240d23eaa09390 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <rudi_s@users.sourceforge.net>
Date: Thu, 24 Nov 2011 21:21:46 +0000
Subject: 29916: Completion/Unix/Command/_git: Prevent clash with
 _remote_files() in _ssh.

---
 ChangeLog                    | 7 ++++++-
 Completion/Unix/Command/_git | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3645503f5..e21fc7731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-24  Simon Ruderich  <simon@ruderich.org>
+
+	* 29916: Completion/Unix/Command/_git: Prevent clash with
+	_remote_files() in _ssh.
+
 2011-11-24  Peter Stephenson  <pws@csr.com>
 
 	* 29915: Completion/Unix/Command/.distfiles,
@@ -15609,5 +15614,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5505 $
+* $Revision: 1.5506 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 6221eb6a4..4a830f281 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5445,7 +5445,7 @@ __git_tree_files () {
 # Repository Argument Types
 
 # _remote_files
-_remote_files () {
+_remote_files_git () {
   # FIXME: these should be imported from _ssh
   # TODO: this should take -/ to only get directories
   # There should be coloring based on all the different ls -F classifiers.
@@ -5484,7 +5484,7 @@ __git_remote_repositories () {
   service= _ssh
 
   if compset -P '*:'; then
-    _remote_files
+    _remote_files_git
   else
     _ssh_hosts -S:
   fi
-- 
cgit 1.4.1