From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43442-ml=inbox.vuxu.org@zsh.org X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.1 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 24c05695 for ; Tue, 11 Sep 2018 13:24:44 +0000 (UTC) Received: (qmail 22192 invoked by alias); 11 Sep 2018 13:24:33 -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: X-Seq: 43442 Received: (qmail 13492 invoked by uid 1010); 11 Sep 2018 13:24:33 -0000 X-Qmail-Scanner-Diagnostics: from out1-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.25):SA:0(-2.6/5.0):. Processed in 4.180865 secs); 11 Sep 2018 13:24:33 -0000 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=0M6yLAxL7R2eEOKxQ q1rNQS9zo9nQpoPtz8lDPX8gKw=; b=jVK2jP673xzOp1VNhjebPrcGYKawh49OL T8zHoN/XdTz0xv+Hhe0og4y+qfeWNWCZcxhC78DGFwPPFfRILrerObckP/0+TSvA qyt+M4popvHGE776ZYyTRs8ue/OnSEqIYm2N6XjHABzAW2JYDTP/C/hhtXPEgSKs GXdoC9UDjViwiRMeIeIbvudI27RdVucKdApE9AsXzgXjPQaAowdVaf2UXrzJns0P Um6iUKOafAL+oB4Up1lBym3M7MXsoujd92AUd1f8tni8ktqlA5H6QpbZq4lleI4U ezX9iJ3Kku9Hjge08Q1nMbm2R/v/TKRke7JDeiQoLBQYG3FAWTMbw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=0M6yLAxL7R2eEOKxQ q1rNQS9zo9nQpoPtz8lDPX8gKw=; b=PjRULx4AK4X1vSLWtUl7tM6skzJAKLsOh Z+9dYk01myXzCCAFRLltTp26qhJ2BmcmRjs65WfxgK0tHWCSbNbVBQ3YEnMNkuU/ hM5YcUUs+ETIN7sQmYZJBgYU1o44dfJraP7tZdB5p2qIOBmqkLYukoq/Aa7rTBi6 Gklk1beehumoKo7Lu4wgpxUUlzkIXZzsxMfk1aqzRehOhzFJfl+jg8wVW112hTJO y64XVQ1JSbaYk3oAbt/HvBjonBask9M83hoAq6qx5Yn2z7SF8M3UckstNW32IGs2 bU3XqT1EVu0P9Rm7mFfVqh24F0tY+EyRXAJ31FrmVWob83dbzbebA== X-ME-Proxy: X-ME-Sender: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 1/2] _git: Break out a helper function. Date: Tue, 11 Sep 2018 13:24:20 +0000 Message-Id: <20180911132421.13932-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 --- Completion/Unix/Command/_git | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 2cae4c82f..b2f93ff0f 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -2108,8 +2108,7 @@ _git-worktree() { ;; esac if [[ $state = worktrees ]]; then - _wanted directories expl 'working tree' compadd -S ' ' -f -M 'r:|/=* r:|=*' \ - ${${(M)${(f)"$(_call_program directories git worktree list --porcelain)"}:#worktree*}#* } && ret=0 + __git_worktrees && ret=0 fi ;; esac @@ -7561,6 +7560,11 @@ __git_browsers () { 'builtin-browsers:builtin browser:compadd -a - builtinbrowsers' } +__git_worktrees () { + _wanted directories expl 'working tree' compadd -S ' ' -f -M 'r:|/=* r:|=*' \ + ${${(M)${(f)"$(_call_program directories git worktree list --porcelain)"}:#worktree*}#* } +} + (( $+functions[__git_difftools] )) || __git_difftools () { __git_diff-or-merge-tools diff $*