From: Daniel Hahler <genml+zsh-workers@thequod.de>
To: zsh-workers@zsh.org
Subject: [PATCH 2/2] completion: git: do not add diff options twice
Date: Fri, 8 May 2015 16:46:45 +0200 [thread overview]
Message-ID: <1431096405-16016-2-git-send-email-genml+zsh-workers@thequod.de> (raw)
In-Reply-To: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>
From: Daniel Hahler <git@thequod.de>
__git_setup_revision_options includes __git_setup_diff_options.
---
Completion/Unix/Command/_git | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c9074ca..4b1a5d1 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1083,12 +1083,10 @@ _git-log () {
local -a log_options revision_options diff_options
__git_setup_log_options
__git_setup_revision_options
- __git_setup_diff_options
_arguments -w -C -s \
$log_options \
$revision_options \
- $diff_options \
'-L+[trace the evolution of a line range or regex within a file]:range' \
'(-)--[start file arguments]' \
'*:: :->commit-range-or-file' && ret=0
@@ -1486,10 +1484,9 @@ _git-show () {
local curcontext=$curcontext state line ret=1
typeset -A opt_args
- local -a log_options revision_options diff_options
+ local -a log_options revision_options
__git_setup_log_options
__git_setup_revision_options
- __git_setup_diff_options
_arguments -w -C -s \
$log_options \
--
2.4.0.dirty
next prev parent reply other threads:[~2015-05-08 14:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-20 17:40 [PATCH 0/7] Various fixes to Git completion Øystein Walle
2013-10-20 17:40 ` [PATCH 1/7] _git: Add missing column.* config variables Øystein Walle
2013-10-20 17:41 ` [PATCH 2/7] _git: Make git-show accept diff arguments Øystein Walle
2015-05-08 14:46 ` [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc) Daniel Hahler
2015-05-08 14:46 ` Daniel Hahler [this message]
2015-05-16 22:55 ` Daniel Shahaf
2013-10-20 17:41 ` [PATCH 3/7] _git: re-order the last two git-blame arguments Øystein Walle
2013-10-20 17:41 ` [PATCH 4/7] _git: Remove unsupported -q option from diff options Øystein Walle
2013-10-20 17:41 ` [PATCH 5/7] _git: fix wrong default value Øystein Walle
2013-10-20 17:41 ` [PATCH 6/7] _git: fix a few "undocumented" options Øystein Walle
2013-10-20 17:41 ` [PATCH 7/7] _git: revert: add '-e,--edit' Øystein Walle
2013-10-21 10:28 ` [PATCH 0/7] Various fixes to Git completion 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=1431096405-16016-2-git-send-email-genml+zsh-workers@thequod.de \
--to=genml+zsh-workers@thequod.de \
--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).