zsh-workers
 help / color / mirror / code / Atom feed
From: Simon Ruderich <simon@ruderich.org>
To: zsh-workers@zsh.org
Subject: PATCH: Completion/Unix/Command/_git: Prevent clash with _remote_files() in _ssh.
Date: Thu, 24 Nov 2011 19:04:52 +0100	[thread overview]
Message-ID: <816075f30c91faee65e3c08eb51fa9e5754ff69f.1322157790.git.simon@ruderich.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1107 bytes --]

---
Hello,

This patch prevents a clash with _remote_files() in _git and
_ssh which both use the same function name.

This caused the file completion of _ssh to stop if _git was used.

Regards,
Simon

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

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 6221eb6..4a830f2 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
-- 
1.7.7.3

-- 
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

                 reply	other threads:[~2011-11-24 18:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=816075f30c91faee65e3c08eb51fa9e5754ff69f.1322157790.git.simon@ruderich.org \
    --to=simon@ruderich.org \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).