zsh-workers
 help / color / mirror / code / Atom feed
From: "Øystein Walle" <oystwa@gmail.com>
To: zsh-workers@zsh.org
Cc: m0viefreak <m0viefreak.cm@googlemail.com>
Subject: [PATCH v2 04/14] _git: correctly use __git_guard_number in some cases
Date: Sun, 22 Sep 2013 12:48:18 +0200	[thread overview]
Message-ID: <1c318109e550184e3b7a81c52884eab1dc73bf4a.1379846744.git.oystwa@gmail.com> (raw)
In-Reply-To: <cover.1379846744.git.oystwa@gmail.com>
In-Reply-To: <cover.1379846744.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 0f4ead3..6797f9c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -850,7 +850,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]' \
@@ -2548,7 +2548,7 @@ _git-config () {
             (umask)
               _alternative \
                 'values:value:(user)' \
-                'umasks::__git_guard_number umask' && ret=0
+                'umasks: :__git_guard_number umask' && ret=0
               ;;
           esac
           ;;
@@ -2910,12 +2910,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
       ;;
@@ -3150,7 +3150,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-09-22 10:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-22 10:48 [PATCH v2 00/14] Improvements to the Git completion functions Øystein Walle
2013-09-22 10:48 ` [PATCH v2 01/14] _git: fix a wrong variable in __git_config_values Øystein Walle
2013-09-22 10:48 ` [PATCH v2 02/14] _git: fix usage of ->int: for some entries in _git-config Øystein Walle
2013-09-22 10:48 ` [PATCH v2 03/14] _git: make git submodule <cmd> completion work Øystein Walle
2013-09-22 10:48 ` Øystein Walle [this message]
2013-09-22 10:48 ` [PATCH v2 05/14] _git: completion updates to match latest git v1.8.3 Øystein Walle
2013-09-22 10:48 ` [PATCH v2 06/14] _git: completion updates to match latest git v1.8.3 part 2 Øystein Walle
2013-09-22 10:48 ` [PATCH v2 07/14] _git: add new configuration options to match latest git v1.8.3 Øystein Walle
2013-09-22 10:48 ` [PATCH v2 08/14] _git: reword _git-config TODO Øystein Walle
2013-09-22 10:48 ` [PATCH v2 09/14] _git: support completing remote branches without <remote>/ prefix Øystein Walle
2013-09-22 10:48 ` [PATCH v2 10/14] _git: fix some typos in description texts Øystein Walle
2013-09-22 10:48 ` [PATCH v2 11/14] _git: remove TODOs of actually documented options Øystein Walle
2013-09-22 10:48 ` [PATCH v2 12/14] _git: correct some "undocumented" options Øystein Walle
2013-09-22 10:48 ` [PATCH v2 13/14] _git: change completion text for consistency Øystein Walle
2013-09-22 10:48 ` [PATCH v2 14/14] _git: git rm: make git rm --cached work as intended Øystein Walle
2013-09-22 12:09 ` [PATCH v2 00/14] Improvements to the Git completion functions Frank Terbeck
2013-09-22 12:31   ` Frank Terbeck

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=1c318109e550184e3b7a81c52884eab1dc73bf4a.1379846744.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).