zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: m0viefreak <m0viefreak.cm@googlemail.com>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH 3/4] _git: log: ignore numeric options
Date: Tue, 15 Mar 2016 00:08:37 +0000	[thread overview]
Message-ID: <20160315000837.GA29956@tarsus.local2> (raw)
In-Reply-To: <1457906520-2612-4-git-send-email-m0viefreak.cm@googlemail.com>

m0viefreak wrote on Sun, Mar 13, 2016 at 23:01:59 +0100:
> git log allows -<number> arguments as a synonym for -n <number>,
> This however broke completion of further option arguments.
> 

m0viefreak reported on IRC the breakage does not occur since
workers/36236 (a4c41fff1261), but suggested the patch was still needed
to avoid numeric options being parsed by _git-log as the first
positional argument.

I couldn't reproduce that: with current master, none of «git log
-<TAB>», «git log -9<TAB>», or «git log -9 -<TAB>» go through the
'first-commit-ranges-or-files' code branch.

m0viefreak, if there is still a (possibly latent) bug in current master,
could you please explain/show it?

Thanks,

Daniel

P.S. The two case branches should probably be combined now: 36236 made
them very similar.

> Simply ignore all numeric options to make it work.
> ---
>  Completion/Unix/Command/_git | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
> index 1241058..023740e 100644
> --- a/Completion/Unix/Command/_git
> +++ b/Completion/Unix/Command/_git
> @@ -1087,7 +1087,7 @@ _git-log () {
>    __git_setup_log_options
>    __git_setup_revision_options
>  
> -  _arguments -w -C -s \
> +  _arguments -w -C -s -A "-[0-9]#" \
>      $log_options \
>      $revision_options \
>      '-L+[trace the evolution of a line range or regex within a file]:range' \
> -- 
> 2.5.0.234.gefc8a62
> 
> 


  reply	other threads:[~2016-03-15  0:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-13 22:01 [PATCH 0/4] A few patches to _git m0viefreak
2016-03-13 22:01 ` [PATCH 1/4] _git: reflog: complete references next to commands m0viefreak
2016-03-15  0:08   ` Daniel Shahaf
2016-03-13 22:01 ` [PATCH 2/4] _git: fix tag name of remote branches m0viefreak
2016-03-15  0:08   ` Daniel Shahaf
2016-03-13 22:01 ` [PATCH 3/4] _git: log: ignore numeric options m0viefreak
2016-03-15  0:08   ` Daniel Shahaf [this message]
2016-03-16 20:43     ` m0viefreak
2016-03-16 22:39       ` Daniel Shahaf
2016-03-16 23:00         ` m0viefreak
2016-03-13 22:02 ` [PATCH 4/4] completion: _git: diff: add --no-index m0viefreak

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=20160315000837.GA29956@tarsus.local2 \
    --to=d.s@daniel.shahaf.name \
    --cc=m0viefreak.cm@googlemail.com \
    --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).