From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10520 invoked by alias); 12 Aug 2015 03:05:21 -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: 36116 Received: (qmail 3415 invoked from network); 12 Aug 2015 03:05:19 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=11mEqORRNgsGrYtrJAchCLvM2fuMwYhQBp26liRoC94=; b=PU0FDMXih50M7o9AorjkBiR6WDrzgJj95VRlMkjhNQ2k/CjyEmxPx8WUwlB9FyryK/ aPgfeHVk2mE5kp3X1B+6dWsi/Tfc+j2gHJy5YYbqQWLyr8PSGxxTkndmYvstUwAH2IJT 6mTRgTj0zpGzJ6s/YcVjiSMTBiG69uBLfLqsvHzxpaR9fjoDspaIrKk7EDSlRnHJ56Sz Z4iuifYZ/3ow393TxkxounstLzvRO0fpTkfbWXGBhF2/yO/klBfgdGgOA/zoNX80gEwf To1mJ2WH8rNAETip9nrKpfqFue0bM4dbh+8UKXqiIwMQbnFtiKoLvfvKVk85Cwcg0FIM V8Rg== X-Received: by 10.180.23.66 with SMTP id k2mr41835441wif.85.1439348716605; Tue, 11 Aug 2015 20:05:16 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 1/5: _git: various fixes Date: Wed, 12 Aug 2015 05:04:59 +0200 Message-Id: <1439348703-8268-1-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 2.4.0 Add = to git checkout --conflict= completion fix transposed [- git push remote argument is not optional can use shorter syntax for a check --- Completion/Unix/Command/_git | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 5b78a2b..4357b74 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -132,7 +132,7 @@ _git-archive () { declare -a backend_args - if (( words[(I)--format=*] > 0 && words[(I)--format=*] < CURRENT )); then + if (( words[(b:CURRENT-1:I)--format=*] )); then case ${words[$words[(I)--format=*]]#--format=} in (zip) backend_args=( @@ -442,7 +442,7 @@ _git-checkout () { '(-b -B -t --track --patch --detach)--orphan[create a new orphan branch based at given commit]: :__git_branch_names' \ '--ignore-skip-worktree-bits[ignores patterns and adds back any files in ]' \ '(-q --quiet -f --force -m --merge --conflict --patch)'{-m,--merge}'[3way merge current branch, working tree and new branch]' \ - '(-q --quiet -f --force -m --merge --patch)--conflict[same as --merge, using given merge style]:style:(merge diff3)' \ + '(-q --quiet -f --force -m --merge --patch)--conflict=[same as --merge, using given merge style]:style:(merge diff3)' \ '(-)'{-p,--patch}'[interactively select hunks in diff between given tree-ish and working tree]' \ '(-)--[start file arguments]' \ '*:: :->branch-or-tree-ish-or-file' && ret=0 @@ -1285,7 +1285,7 @@ _git-push () { '(--verify)--no-verify[bybass the pre-push hook]' \ '--recurse-submodules=[submodule handling]:submodule handling:((check\:"refuse pushing of supermodule if submodule commit cannot be found on the remote" on-demand\:"push all changed submodules"))' \ - ':: :__git_any_repositories' \ + ': :__git_any_repositories' \ '*: :__git_ref_specs' && ret=0 case $state in @@ -6356,8 +6356,8 @@ __git_setup_revision_options () { '*--not[reverses meaning of ^ prefix for revisions that follow]' '--all[show all commits from refs]' '--branches=-[show all commits from refs/heads]::pattern' - '--tags=[-show all commits from refs/tags]::pattern' - '--remotes=[-show all commits from refs/remotes]::pattern' + '--tags=-[show all commits from refs/tags]::pattern' + '--remotes=-[show all commits from refs/remotes]::pattern' '--glob=[show all commits from refs matching glob]:pattern' '--exclude=[do not include refs matching glob]:pattern' '--exclude=[do not include refs matching glob]:pattern' -- 2.4.0