zsh-workers
 help / color / mirror / code / Atom feed
From: "Øystein Walle" <oystwa@gmail.com>
To: zsh-workers@zsh.org
Cc: m0viefreak.cm@googlemail.com
Subject: [PATCH 04/16] _git: correctly use __git_guard_number in some cases
Date: Sun, 28 Jul 2013 18:22:01 +0200	[thread overview]
Message-ID: <149ba7ec457224240c9d5dd01bff6a14fb035a57.1375006129.git.oystwa@gmail.com> (raw)
In-Reply-To: <cover.1375006129.git.oystwa@gmail.com>
In-Reply-To: <cover.1375006129.git.oystwa@gmail.com>

From: m0viefreak <m0viefreak.cm@googlemail.com>

The space is relevant to make the help text work as intended.
---
 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 3eff9f8..6370c99 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -845,7 +845,7 @@ _git-grep () {
     '(-a --text)'{-a,--text}'[process binary files as if they were text]' \
     '(-i --ignore-case)'{-i,--ignore-case}'[ignore case when matching]' \
     '-I[do not match pattern in binary files]' \
-    '--max-depth=[descend at most given levels of directories]:__git_guard_number depth' \
+    '--max-depth=[descend at most given levels of directories]: :__git_guard_number depth' \
     '(-w --word-regexp)'{-w,--word-regexp}'[match only whole words]' \
     '(-v --invert-match)'{-v,--invert-match}'[select non-matching lines]' \
     '(   -H)-h[supress output of filenames]' \
@@ -2540,7 +2540,7 @@ _git-config () {
             (umask)
               _alternative \
                 'values:value:(user)' \
-                'umasks::__git_guard_number umask' && ret=0
+                'umasks: :__git_guard_number umask' && ret=0
               ;;
           esac
           ;;
@@ -2902,12 +2902,12 @@ _git-blame () {
     (line-range)
       if compset -P '([[:digit:]]#|/[^/]#(\\?[^/]#)#/),'; then
         _alternative \
-          'line-numbers::__git_guard_number "line number"' \
+          'line-numbers: :__git_guard_number "line number"' \
           'regexes::_guard "(/[^/]#(\\?[^/]#)#(/|)|)" regex' \
           'offsets::_guard "([+-][[:digit:]]#|)" "line offset"' && ret=0
       else
         _alternative \
-          'line-numbers::__git_guard_number "line number"' \
+          'line-numbers: :__git_guard_number "line number"' \
           'regexes::_guard "(/[^/]#(\\?[^/]#)#(/|)|)" regex' && ret=0
       fi
       ;;
@@ -3142,7 +3142,7 @@ _git-show-branch () {
     (limit-and-base)
       if compset -P '[[:digit:]]##,'; then
         _alternative \
-          'counts::__git_guard_number count' \
+          'counts: :__git_guard_number count' \
           'dates::__git_datetimes' && ret=0
       else
         __git_guard_number limit
-- 
1.8.2.2


  parent reply	other threads:[~2013-07-28 16:23 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-28 16:21 [PATCH 00/16] Improvements to the Git completion functions Øystein Walle
2013-07-28 16:21 ` [PATCH 01/16] _git: fix a wrong variable in __git_config_values Øystein Walle
2013-07-28 16:21 ` [PATCH 02/16] _git: fix usage of ->int: for some entries in _git-config Øystein Walle
2013-07-28 16:22 ` [PATCH 03/16] _git: make git submodule <cmd> completion work Øystein Walle
2013-07-28 16:22 ` Øystein Walle [this message]
2013-07-28 16:22 ` [PATCH 05/16] _git: completion updates to match latest git v1.8.3 Øystein Walle
2013-07-28 16:22 ` [PATCH 06/16] _git: completion updates to match latest git v1.8.3 part 2 Øystein Walle
2013-07-28 16:22 ` [PATCH 07/16] _git: add new configuration options to match latest git v1.8.3 Øystein Walle
2013-07-28 16:22 ` [PATCH 08/16] _git: reword _git-config TODO Øystein Walle
2013-07-28 16:22 ` [PATCH 09/16] _git: support completing remote branches without <remote>/ prefix Øystein Walle
2013-07-28 16:22 ` [PATCH 10/16] _git: fix some typos Øystein Walle
2013-07-28 16:22 ` [PATCH 11/16] _git: remove TODOs of actually documented options Øystein Walle
2013-07-30 14:40   ` Nikolai Weibull
2013-07-30 18:01     ` Øystein Walle
2013-07-30 20:41       ` Nikolai Weibull
2013-07-28 16:22 ` [PATCH 12/16] _git: correct some "undocumented" options Øystein Walle
2013-07-30 14:39   ` Nikolai Weibull
2013-07-30 16:06     ` m0viefreak
2013-07-30 20:45       ` Nikolai Weibull
2013-07-28 16:22 ` [PATCH 13/16] _git: change completion text for consistency Øystein Walle
2013-07-28 16:22 ` [PATCH 14/16] _git: move --(no-)follow to be log-specific option Øystein Walle
2013-07-28 16:22 ` [PATCH 15/16] _git: git rm: make git rm --cached work as intended Øystein Walle
2013-07-30 14:37   ` Nikolai Weibull
2013-07-30 15:04     ` Aaron Schrab
2013-07-30 15:47       ` Nikolai Weibull
2013-07-28 16:22 ` [PATCH 16/16] _git: Document --early-output Øystein Walle
2013-07-30 14:35   ` Nikolai Weibull
2013-07-30 16:31     ` Øystein Walle
2013-07-30 20:42       ` Nikolai Weibull
2013-07-28 17:25 ` [PATCH 00/16] Improvements to the Git completion functions Peter Stephenson

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=149ba7ec457224240c9d5dd01bff6a14fb035a57.1375006129.git.oystwa@gmail.com \
    --to=oystwa@gmail.com \
    --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).