From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15954 invoked by alias); 8 May 2015 14:46:55 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 35062 Received: (qmail 4486 invoked from network); 8 May 2015 14:46:54 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 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= From: Daniel Hahler 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 Message-Id: <1431096405-16016-2-git-send-email-genml+zsh-workers@thequod.de> X-Mailer: git-send-email 2.4.0.dirty In-Reply-To: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de> References: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de> From: Daniel Hahler __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