From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 28281 invoked from network); 27 Jun 2020 06:16:28 -0000 Received: from ns1.primenet.com.au (HELO primenet.com.au) (203.24.36.2) by inbox.vuxu.org with ESMTPUTF8; 27 Jun 2020 06:16:28 -0000 Received: (qmail 2930 invoked by alias); 27 Jun 2020 06:16:23 -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: List-Unsubscribe: Sender: zsh-workers@zsh.org X-Seq: 46142 Received: (qmail 8779 invoked by uid 1010); 27 Jun 2020 06:16:22 -0000 X-Qmail-Scanner-Diagnostics: from sender4-of-o56.zoho.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.3/25850. spamassassin: 3.4.4. Clear:RC:0(136.143.188.56):SA:0(-2.0/5.0):. Processed in 0.697985 secs); 27 Jun 2020 06:16:22 -0000 X-Envelope-From: mk@mkoskar.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at spf.zoho.com designates 136.143.188.56 as permitted sender) ARC-Seal: i=1; a=rsa-sha256; t=1593238408; cv=none; d=zohomail.com; s=zohoarc; b=jIPosA9CCQVpSyoDFN1OJRvFHfvBvWsHJb9V41peJqp/cmHeB5BI8IRKaGR6etajgy6ku+fAt2nh6relgXWWvoWP95Wgg4eFA4vtG+ETOTZ2Up4Dzwg5L4Gj8zJQPPlbOZYBk1/OVgxqI3QPqk6A7Hb0b3fC4+kNrf88GFYhZ8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593238408; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=x5Qxi7HGyb/ygj/wrffKwlOhcfkWoTk3Pdv/qyi4nXM=; b=HTw9UsFpRzb7lz1cCsGoxQajm23bLRn1KxYrf/0d0yTCT3JGeZ20gPL+jhHOUCFzcCtG30lidh6ID+G4JBohwm/QWDyuBNr1Qn8ji5pKQVqRgy4D9Tjc1DcWCLpVPA2YxkcjqhmJF48rxiY+cvpzGkO6wpMjYOVzht2HVI/LYBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=mkoskar.com; spf=pass smtp.mailfrom=mk@mkoskar.com; dmarc=pass header.from= header.from= From: =?UTF-8?q?Miroslav=20Ko=C5=A1k=C3=A1r?= To: zsh-workers@zsh.org Cc: d.s@daniel.shahaf.name Message-ID: <010627a701d00eb778b1c8bde314497f28912a74.1593236365.git.mk@mkoskar.com> Subject: [PATCH 4/4] _git: Don't shadow global aliases Date: Sat, 27 Jun 2020 08:12:18 +0200 X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset=utf8 --- Completion/Unix/Command/_git | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index e2d3d6e..6f7a462 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -8116,15 +8116,11 @@ _git() { _git_commands && ret=3D0 ;; (option-or-argument) - local -a aliases local -A git_aliases - local a k v + local a local endopt=3D'!(-)--end-of-options' - aliases=3D(${(0)"$(_call_program aliases git config -z --get-regex= p '\^alias\\.')"}) - for a in ${aliases}; do - k=3D"${${a/$'\n'*}/alias.}" - v=3D"${a#*$'\n'}" - git_aliases[$k]=3D"$v" + for a in ${(0)"$(_call_program aliases git config -z --get-regexp = '\^alias\\.')"}; do + git_aliases[${${a/$'\n'*}/alias.}]=3D${a#*$'\n'} done local git_alias=3Dgit_aliases[\$words[1]] if (( ${(P)+git_alias} && !$+commands[git-$words[1]] && !$+functio= ns[_git-$words[1]] )); then --=20 2.27.0