From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18560 invoked by alias); 24 Nov 2011 18:10:06 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 29916 Received: (qmail 29281 invoked from network); 24 Nov 2011 18:10:03 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 Received-SPF: pass (ns1.primenet.com.au: SPF record at ruderich.org designates 178.63.68.96 as permitted sender) Date: Thu, 24 Nov 2011 19:04:52 +0100 From: Simon Ruderich To: zsh-workers@zsh.org Subject: PATCH: Completion/Unix/Command/_git: Prevent clash with _remote_files() in _ssh. Message-ID: <816075f30c91faee65e3c08eb51fa9e5754ff69f.1322157790.git.simon@ruderich.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="=_zucker.schokokeks.org-12277-1322157893-0001-2" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2011-04-20) --=_zucker.schokokeks.org-12277-1322157893-0001-2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable --- 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 =20 # _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=3D _ssh =20 if compset -P '*:'; then - _remote_files + _remote_files_git else _ssh_hosts -S: fi --=20 1.7.7.3 --=20 + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 --=_zucker.schokokeks.org-12277-1322157893-0001-2 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBCAAGBQJOzodEAAoJEJL+/bfkTDL58kEP/jVzqLKgeaM3GzHLwIK6gQpp 3WvyfEakCIhYyFQ3BxPLie40l5DujHrfUToDnV20MeAQrJ9dWE4wBkgoIav7y4q+ 5RIMrY1TaJwhSeunroo4OSKZGHC7pysRd77rseGwGi4D7jOSC9/PuJVhDd9BTztj GD0wBHsDw/vmn1B6APJmt6v/etBRjQoQTwdm+HKS9yxogb0f+02knwB7yDMSuIYT AwIMIOijGXYJ798iaEb5CUUurpSGPGrkfQeXn4I0BGxnNXJg+RJWqsuSh3fzGB8u kKrzcYC5w5EnvOzhiroLZWXRc7TgSf+AC+0udQk33+vmtS1nB447A7SdcKhimcL4 m9BbZ5hOw0OzEB58eU+pYO6ObAl970kqT79RYSNnV3SD8ukrBZwv1/d32t9zd7V2 3w7DXwgVjCOAH5Rp0kv8pMCJ26ba8lgKy0zEtM3Wx0MmLBIVWD8woBPce3hoaW9z ej5IqqaEItjdQgSv0tOX0dys/R6n97YCzDdUUKszmnxHP11IjJHajOi1AztbcXFj GS9NinHqMl18eHhr55QUIX/OoQxdEggivnlkbqK8J4A5Ph0EaZqHt88vBNSXY4+Z U70ulUWx5gfhz5pYGkbBh2/c+wHj4B1UAVeypoL/CUBFPLxpnttMYVi5fRIpPgka uB7KCIg479AL9+0nUtV9 =7Aw8 -----END PGP SIGNATURE----- --=_zucker.schokokeks.org-12277-1322157893-0001-2--