Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 2/2] completion: git: do not add diff options twice
- X-seq: zsh-workers 35062
- From: Daniel Hahler <genml+zsh-workers@xxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH 2/2] completion: git: do not add diff options twice
- Date: Fri, 8 May 2015 16:46:45 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thequod.de; h= references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=postfix2; t= 1431096412; bh=mhWio6usOxvH7b3jaApRdRX6jaMU9abyWIphmkhlV+A=; b=T UIJRZdefAnueUTt2yWIOECSFFo3GGFZLfVPq92KYsR5Jk1GMEAeLe8WsUzIeWzUW J/z3H6uIe+C8jgBGq+I4xoNPPHt/VAPv4koYq4/1klEljKmY1MoUdGiLC/DkYSS8 R/k8flSSdnhfnrj9O27D3xwb5b+IUWo/XS7g1Fh1bk=
- In-reply-to: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- References: <f9059726c9c756ffcaf3ec45b6c27c2e8999376b.1382290245.git.oystwa@gmail.com> <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>
From: Daniel Hahler <git@xxxxxxxxxx>
__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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author