From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Zsh workers <zsh-workers@zsh.org>
Subject: Re: PATCH: git 2.19 completion update
Date: Tue, 16 Oct 2018 23:20:34 +0000 [thread overview]
Message-ID: <20181016232034.mxhru4maq7oxr3n4@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <65933-1539730826.973717@3lp_.duon.gcyw>
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
prev parent reply other threads:[~2018-10-16 23:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 23:00 Oliver Kiddle
2018-10-16 23:20 ` Daniel Shahaf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181016232034.mxhru4maq7oxr3n4@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).