From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43699-ml=inbox.vuxu.org@zsh.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 92cf9197 for ; Tue, 16 Oct 2018 23:20:55 +0000 (UTC) Received: (qmail 17415 invoked by alias); 16 Oct 2018 23:20:44 -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: 43699 Received: (qmail 27613 invoked by uid 1010); 16 Oct 2018 23:20:43 -0000 X-Qmail-Scanner-Diagnostics: from wout1-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(64.147.123.24):SA:0(-2.6/5.0):. Processed in 3.252823 secs); 16 Oct 2018 23:20:43 -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:to:subject:message-id:references :mime-version:content-type:content-transfer-encoding :in-reply-to; s=fm1; bh=w00ezz3bvM0nRqXSDPQtRwhc7nBreagJmmjvXyWp AMs=; b=b+N6NViF3+8j4vUbi/o4fuqaAj/d1pVHN8oTuQwngbvVW5CaNVkb+A6J Tjr+eUHpk91EE6QdSdceRpOg2DYeze2M//9cW6DFnxMZ1bvPIMw2ZcUF2FtFEhD1 v7fmtjAjHhgvm03epo2PVhNo8pNCo7NAhVRpJ0RA0U7VS3GmjHXDTwBviCsPSvXK 4XIXWFQ5dpqSdLfaL1x3Szigy+TGNCxU+ovcfbAwl4cL67lnbYyKf+gxWyPatSZR awt4CyJDOkV+6+4ws2pOcBjCcI+aprawH2iRXB95SoA4TW8gBNwdyL/WGVRcyfte uSHLy+eQs0YjAKRhpG7WQCiMyyCASA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=w00ezz3bvM0nRqXSDPQtRwhc7nBreagJmmjvXyWpA Ms=; b=q6F6M+X1VkF2TiYlURLoWNimoVJv7yOA+KUGI51ri3SwStdQKhNJBAFG2 WKo9uLnUDB0IwDSFzN0ZCkiNxz8DfRx5lDunjrd/r1SIqufZuOBol34/AD35DY/Z snpi9Tvo7LZeHiizWAqcMPk9H5YDLEAUKGX2KdEHGICsfRUe5OolY1Qor6Y6gylo Xbs/gIj7pp8QEORa4JgxSb73BRF7SiGMK3C55AxYckh3t8nZ9xJwkDYLpYiC3OeP loNi15cDeO98ey9Lkii4HLZpow/fnNDaGuc8q/6vkmzHBxLSPv0Q+bcSDR050cIX xoBbOD5r60RR3JH+nq/Pa7kKs8+cQ== X-ME-Sender: X-ME-Proxy: Date: Tue, 16 Oct 2018 23:20:34 +0000 From: Daniel Shahaf To: Zsh workers Subject: Re: PATCH: git 2.19 completion update Message-ID: <20181016232034.mxhru4maq7oxr3n4@tarpaulin.shahaf.local2> References: <65933-1539730826.973717@3lp_.duon.gcyw> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <65933-1539730826.973717@3lp_.duon.gcyw> User-Agent: NeoMutt/20170113 (1.7.2) Oliver Kiddle wrote on Wed, Oct 17, 2018 at 01:00:26 +0200: > +++ b/Completion/Unix/Command/_git > @@ -295,7 +295,7 @@ _git-branch () { > declare l c m d e > > l='--color --no-color -r --remotes -a -v --verbose --abbrev --no-abbrev --list --points-at --sort' > - c='-l --create-reflog -f --force -t --track --no-track -u --set-upstream --set-upstream-to --unset-upstream --contains --no-contains --merged --no-merged' > + c='--create-reflog -f --force -t --track --no-track -u --set-upstream --set-upstream-to --unset-upstream --contains --no-contains --merged --no-merged' > m='-c --copy -C -m --move -M --edit-description' > d='-d --delete -D' > > @@ -337,7 +337,7 @@ _git-branch () { > "($c $m $d : -v -vv --verbose)"{-v,-vv,--verbose}'[show SHA1 and commit subject line for each head]' \ > "($c $m $d :)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length" \ > "($c $m $d :)--no-abbrev[don't abbreviate sha1s]" \ > - "($l $m $d)"{-l,--create-reflog}"[create the branch's reflog]" \ > + "($l $m $d)--create-reflog[create the branch's reflog]" \ > "($l $m $d -f --force)"{-f,--force}'[force the creation of a new branch]' \ > "($l $m $d -t --track)"{-t,--track}'[setup configuration so that pull merges from the start point]' \ > "($l $m $d)--no-track[override the branch.autosetupmerge configuration variable]" \ Not related to the patch, but _git-branch considers --remotes and --contains to be mutually exclusive, though they aren't: «git branch -r --contains=HEAD» works. I'd have fixed it, but I didn't quite understand the logic behind these one-letter variables. Cheers, Daniel