From patchwork Sun Oct 25 03:13:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855089 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5174FC56201 for ; Sun, 25 Oct 2020 03:13:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2438620882 for ; Sun, 25 Oct 2020 03:13:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="egMrImZ2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766822AbgJYDNu (ORCPT ); Sat, 24 Oct 2020 23:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731837AbgJYDNt (ORCPT ); Sat, 24 Oct 2020 23:13:49 -0400 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6CB6C0613CE for ; Sat, 24 Oct 2020 20:13:49 -0700 (PDT) Received: by mail-oi1-x243.google.com with SMTP id u17so6950701oie.3 for ; Sat, 24 Oct 2020 20:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KP8M/6Zey1w8U/r0Vdi1896il9WkPM/iUniB5jCSgbE=; b=egMrImZ2X4gleUAKbuXVvj5+kFv3CTvJgm6JqadyY5DHZ59CgSanXhydTN44Ut2QC8 CU6jdP6KYu2dr7IomsHxhzcUXncMW1dUFf60fTXR3B0F7smm2tjBdracLljmW9+Z0Nlv VldciyDBjEpBmtxWHUFlCqGu2icQCN9F4OQCHd9EDpbsM6N5muRUbPYKJhxuJeLtV8pJ ZI/OWeGa2IvLY/vCmBq4vchgR8ITGH69eKFqdQkXnhwJKT3agvGZFi/XkHDYNRWsIc7D OvxI2olC69pWUDkkWF/gI19/n0HTYPt3+UILiGPWRbxmU3+E63/RxzCHslgXoFN/5m8v tOnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KP8M/6Zey1w8U/r0Vdi1896il9WkPM/iUniB5jCSgbE=; b=qoakP3QLeqawczUr71WoWSVZbGkKsgyu7U5Ojw5vsC6/Jfw7YjSI72QGtbf1umc6hz N1pUi7obqJtIQWYh2aIlIyhrLXPclWxEprsgg9yNL2EAYfc4UorKAoz8weaCcYIZMl/o kPazG290xfC23Q/qAN8V0AjI3yyjGt1ggAZ3TTLACx6eGe7nBbbEy7xIztYzwu1A5iJ2 IxFm2NxadGf6XRkjUAXqB/sAPOIZmGPpgNMNlWJS81YUZYVAhPZ/1XwVUPdm/p50f9IE VEUVmraE13vqi6Tu2JCaR1/FI6KwRr+I2gShM6lmblnntWBSVDYlC0k8+eW1gM7j577A 8fKw== X-Gm-Message-State: AOAM5304NkgfTxiBRhHw64L6o3zfy+2NhGLCeUV+o2KoPofakKbOSGB8 LcloHwwnPm4hQkGL0CioH8J92bYSbxPA6g== X-Google-Smtp-Source: ABdhPJwV3b1ofk7dy5NV11uX6BoaG0yP3WIadSDLwgDO2/qrmP7ISpryTWVoWNAfSs/F69Xf0RCyqA== X-Received: by 2002:aca:be56:: with SMTP id o83mr8266815oif.1.1603595628837; Sat, 24 Oct 2020 20:13:48 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id t65sm1867353oib.50.2020.10.24.20.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:48 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras , Maxim Belsky , Johannes Schindelin Subject: [PATCH v2 02/29] completion: zsh: fix name due to broken autoloading Date: Sat, 24 Oct 2020 22:13:16 -0500 Message-Id: <20201025031343.346913-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Commit 176f5adfdb wrongly changed the installation path to '~/.zsh/git-completion.zsh', this ensures the script is not automatically loaded. The whole point of adding the script to the fpath variable is that it's autoloaded after typing 'git', which won't happen unless it's named _git. I've changed the wording so it's crystal clear the name of the file *must* be '_git'. http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Autoloaded-files Cc: Maxim Belsky Cc: Johannes Schindelin Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 2cefae943a..6d451355fd 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -11,9 +11,11 @@ # # zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh # -# The recommended way to install this script is to make a copy of it in -# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following -# to your ~/.zshrc file: +# The recommended way to install this script is to make a copy of it as a +# file named '_git' inside any directory in your fpath. +# +# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git', +# and then add the following to your ~/.zshrc file: # # fpath=(~/.zsh $fpath) From patchwork Sun Oct 25 03:13:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855097 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04E29C56201 for ; Sun, 25 Oct 2020 03:14:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BDFE822260 for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GihXQZL2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766840AbgJYDOC (ORCPT ); Sat, 24 Oct 2020 23:14:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766825AbgJYDOB (ORCPT ); Sat, 24 Oct 2020 23:14:01 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29CA1C0613CE for ; Sat, 24 Oct 2020 20:13:51 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id x7so887711ota.0 for ; Sat, 24 Oct 2020 20:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aGA+vh4pwS05AX6WR8w1fgNifpIZvH7XjfOtj1s0RJY=; b=GihXQZL2Xe8dcJUfwKXkp+CKvVxSuaK5SVr+zBDsDGv/FJd7mMudjHc3R/knk4VPsf Mkv2HJVgjfwDHyM6goW8JHziMYVRj+1HEhvFLcZ1NJjtc/W8Qv9W8aB32rmUnBbAA8P2 J4Y8xNuvB4jwQx3WOhsqJNYBL/rOr0vX50bTnfUOq5OYiNRUrGyMwjXoUOHW1mYFA72N 7m3Wx1xcEytv9UIytUidqFDV0IcKkjJ8kiu7zYiqJLxsUZyNuDiUOuMYBqoA7pOTGPz6 Ynz6xlEru0lxPYuzS24/ifSqt7x7bKXK4ERCSe86ori9hYdWv+U1y0zpm5cq4hmLfW6H Ds8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aGA+vh4pwS05AX6WR8w1fgNifpIZvH7XjfOtj1s0RJY=; b=HBSNyJlBmTSRvbOtdVYYqVpUSYxR6LlZIuoWGOwQI2bPlbvNUjIDbXxFCBYiknNKdx UsI9V0bGUyjOHLaAd7tsOqxKmNHhZGBJ6ythxYO6V/HUIcpCB1enb6cE/zO0FwFCP8Vl sfePT4NdGdA7p+D5Iw51s/2oydxxyJu4JkODmcMtrTynbIYpYVLLERBx0pNY80fG4lI4 yhUMFtIACpVq2qpwGlfxDCtpxdDj16PS2Z4vDfGm8rx/KPXswVqZOOSPSnb+aiOqkPG3 QQag6V8ydIR6oXmjUey4xmQc3OSIQnLS67+7GU3ZVTB0SHUiMikunCjyrHZSDlaZFdU9 RFQQ== X-Gm-Message-State: AOAM532NalDiDy/kdLTy3Y9tOMscK9GK2ElEkuqh3Q+NE3n00CCnOUL2 TlYowOK0Rhf50ZztU19TywZqoYKD+57rDg== X-Google-Smtp-Source: ABdhPJx7RVjEFeZi+HlY0e8Ou/y52uEVtobn+BOHEH/oyAcnd2n81KxszCsZDlYVG/v2uwi2/lvrOA== X-Received: by 2002:a9d:734f:: with SMTP id l15mr8776224otk.260.1603595630337; Sat, 24 Oct 2020 20:13:50 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id j84sm1903095oia.25.2020.10.24.20.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:49 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras , Peter van der Does Subject: [PATCH v2 03/29] completion: zsh: fix bash script extension Date: Sat, 24 Oct 2020 22:13:17 -0500 Message-Id: <20201025031343.346913-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Commit 0e5ed7cca3 wrongly changed the extension of the bash script to .zsh; the zstyle configuration is for the slave script (bash), not the master one (zsh). For example it could be: zstyle ':completion:*:*:git:*' script ~/.git-completion.bash The extension doesn't really matter, but it confuses people into thinking it's a zsh script; it's not. Cc: Peter van der Does Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 6d451355fd..712ce2f4d1 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -9,7 +9,7 @@ # # If your script is somewhere else, you can configure it on your ~/.zshrc: # -# zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh +# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash # # The recommended way to install this script is to make a copy of it as a # file named '_git' inside any directory in your fpath. From patchwork Sun Oct 25 03:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27101C2D0A3 for ; Sun, 25 Oct 2020 03:13:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDEFB20882 for ; Sun, 25 Oct 2020 03:13:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZHGc5puI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766824AbgJYDNx (ORCPT ); Sat, 24 Oct 2020 23:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731837AbgJYDNx (ORCPT ); Sat, 24 Oct 2020 23:13:53 -0400 Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6319C0613D0 for ; Sat, 24 Oct 2020 20:13:52 -0700 (PDT) Received: by mail-oi1-x241.google.com with SMTP id l4so6922615oii.13 for ; Sat, 24 Oct 2020 20:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lhUPGPVcJ1UohPkAjY7ALwU4faSqEsmKFU1bWSltr9E=; b=ZHGc5puI8nypnFuHfEpct3IMzUtiqkTKVOONFR1eyb2i2VJSlFeUmU14ifI9JOWEfO pOEMBT3Riu57S3eUPmLsGKqJ7bSYqz8uXZthqAV8RVbhbQ2yzWXP6MAKmkAfylpruJhU xdThhM6LjhO8wIPJ/JF/FklQ/tccIGy3qpvjz4sWY/pW9X0kCjmFOj4VxdFR2bOTfBP7 qaXRpSpTJCpj9Hje0TSHN5G+yQoh4l6us9x7/Sr9wge72eofuUeiQr6m16NpTnnqI5Ko oYrla6tT2S0fsmM1P5QtKjQ1lYpev7WXHv+ydU6IEu2H13Zeilk6v1wUVN0lWJe8ORFn kyRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lhUPGPVcJ1UohPkAjY7ALwU4faSqEsmKFU1bWSltr9E=; b=VH8CL1vlFAiA4UPILPh2wjmmOy0V+ydcfyMvFsMt+XwCLmAsMthl79NRRVCbL2FN06 lK7xTTLA8aCGz6+K6HG4sGbnf+jsVRCFY2UIwRpbeqalXwyzP2EPjnhIC49iLW1ndQ7X IQ3H8sFq/xYIuRLO3R+N1OvmiKJ4nqMMhapmNU7PEuO23paKCnIu4dwySUq6XCBJ7i4D /FR02y8kz0Z78XdWafyElW/sU8z9h8bpDlGJcGPQ3L3r5VKJMaomB8kfmk6v1UM7x+ap Zkt93pXxFec5vikWp+pWFUFJAoPpUrvEMdkxTZhNPPa3WP4iYaTJBJSfyrB+pYK2l2mm egtw== X-Gm-Message-State: AOAM530ZuGgexNHPZq5k0yXw/5+7W5VKiA0J5qLElOobfHBDQP8yklUy 90OQi7VdNdrTqEQFdHGLNwFoId7isWa/Cw== X-Google-Smtp-Source: ABdhPJx7t0fDHSZ9f4tUElAx8cc5tH3fHqXnDSTS8H6lQo77JlhL9hxUbEKvfzzdADsc7m/tlnUXUw== X-Received: by 2002:aca:750b:: with SMTP id q11mr7636725oic.163.1603595631879; Sat, 24 Oct 2020 20:13:51 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id t65sm1867374oib.50.2020.10.24.20.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:51 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 04/29] completion: zsh: reorganize install instructions Date: Sat, 24 Oct 2020 22:13:18 -0500 Message-Id: <20201025031343.346913-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Start with the most important thing; the proper location of this script, then follow with the location of the slave script (git-completion.bash). Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 712ce2f4d1..05ccaac194 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -4,13 +4,6 @@ # # Copyright (c) 2012-2013 Felipe Contreras # -# You need git's bash completion script installed somewhere, by default it -# would be the location bash-completion uses. -# -# If your script is somewhere else, you can configure it on your ~/.zshrc: -# -# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash -# # The recommended way to install this script is to make a copy of it as a # file named '_git' inside any directory in your fpath. # @@ -18,6 +11,15 @@ # and then add the following to your ~/.zshrc file: # # fpath=(~/.zsh $fpath) +# +# You need git's bash completion script installed. By default bash-completion's +# location will be used (e.g. /usr/share/bash-completion/completions/git). +# +# If your bash completion script is somewhere else, you can specify the +# location in your ~/.zshrc: +# +# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash +# complete () { From patchwork Sun Oct 25 03:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53A02C55179 for ; Sun, 25 Oct 2020 03:13:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1186020936 for ; Sun, 25 Oct 2020 03:13:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WtUMLths" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766828AbgJYDNz (ORCPT ); Sat, 24 Oct 2020 23:13:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766825AbgJYDNy (ORCPT ); Sat, 24 Oct 2020 23:13:54 -0400 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A02C0613D0 for ; Sat, 24 Oct 2020 20:13:54 -0700 (PDT) Received: by mail-ot1-x332.google.com with SMTP id k68so5082444otk.10 for ; Sat, 24 Oct 2020 20:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S2eDfVGUiyHpawzgftowHtF3fud9qQUOkFfKgPJeFGo=; b=WtUMLths/RwYN7fvwXfEfNmbohiYg4GyaRKSQedaTEMt1NokjccSO1GzxEs84Qo9jE lS8qnN/Xo8hNl+hq45rTS8nEWuriDjfFVV1yrLTHU876VV4YVERmeV4hW0FzNT8DY/YD lAyhYKxuCZgtKhyX5F/f+nDuLjNVqDyHfwlK77oeb5iQ4dRFspeFd0oeaCLz8g5iuKK5 J8C8uL0sWgRAirpfxQ+PGbdpEqecJHKnTR1j3QFfYcfVOfPI8WNuVCJFfjr4V/VQ/FGu SnlYxOdsMQcGtxo3/Q3l2PiXYTwXj0mJscW65MAVYLiT18uxiQkUiyJO8py0TX3npkhs ZCvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S2eDfVGUiyHpawzgftowHtF3fud9qQUOkFfKgPJeFGo=; b=m5EAjYuHN93nuALIVDxoiiZDtk+Q2MVYngbQfORztIZbbzmwyCtSUeA3JhrzlPb4y8 tthaO+uDIo9fbUxhb7bKcHawqR1uTVUcoVhUiKiSkSFvKC5kB6f2v/yjOcOjUc1rPeqQ VX013MN15JV8w2uTgbUzgEA1ItD3miZaF9TdOrBqYTx1V5TsFrXeRHATwD19laPafz8g bRjzH2SmVC67Z95BNMl8OQx0GOJHOA7WNNhfKvYIi6qS1wqpe5QLsebyxXGypcxp+Nwp TCOmvo8coA2qU9YB7NuQ+6z8iDXvrOg3G7qIgEiJvXBl9usuOTv2bF7OZYhpOAUR6vAG zztQ== X-Gm-Message-State: AOAM531qnmBbaYAKklRSWyIPgIlGZyjU1Gn9CZh54d3i+c9j0EkYxvhW XU6az4v7jPkXv+o+7dZEjGM0Ys4MMc65MA== X-Google-Smtp-Source: ABdhPJwixGS8Kz36bfCZ8IJV3fhS2MrfJP2uOOTXTULgomvdhH5CQO1u3Nk6zn6Zn8h/MZwjdGOxEg== X-Received: by 2002:a9d:6e15:: with SMTP id e21mr8819488otr.139.1603595633579; Sat, 24 Oct 2020 20:13:53 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id u1sm1744162ooj.28.2020.10.24.20.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:53 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 05/29] completion: zsh: fix for directories with spaces Date: Sat, 24 Oct 2020 22:13:19 -0500 Message-Id: <20201025031343.346913-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 05ccaac194..5d6740c6ff 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -35,7 +35,7 @@ if [ -z "$script" ]; then local -a locations local e locations=( - $(dirname ${funcsourcetrace[1]%:*})/git-completion.bash + "$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash '/etc/bash_completion.d/git' # fedora, old debian '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian '/usr/share/bash-completion/git' # gentoo From patchwork Sun Oct 25 03:13:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 116F2C56201 for ; Sun, 25 Oct 2020 03:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D20D920882 for ; Sun, 25 Oct 2020 03:13:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aC02ACCy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766830AbgJYDN5 (ORCPT ); Sat, 24 Oct 2020 23:13:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766825AbgJYDN4 (ORCPT ); Sat, 24 Oct 2020 23:13:56 -0400 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1980C0613D0 for ; Sat, 24 Oct 2020 20:13:55 -0700 (PDT) Received: by mail-oi1-x22c.google.com with SMTP id k27so6917506oij.11 for ; Sat, 24 Oct 2020 20:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5HTKkjlsvO7pfRgTUth2glsjU4eVeg5JumsflCIA0x4=; b=aC02ACCyzCawAP9smuwLSGKQ9KqtuOCy3b0wiZoJXSsv+rOHrr7MxiZMjJpnQiF44H g1VrhpRz67ME/yAnhvYQog8OIpQ/1bCFaIeCTVuFDMYPzF7ud9u5Qi0fp6OCIiHzdsG8 miduI89IbrxpbrqgVbyCfT2CoQZdnnSVQuk0Le3AIrV57QP93g9VmEWyJkuGwtvkBlMO pXIp0NWO5WaCXY/vzJ1MdijZYe8/KPAyp/RVd7+ZJ3pmV+Dh8f46z9e96LdKe+A9hW7q Om27krabJA3qU0TNLnwSG8qRXq3s+qL0ey+gPEorHlmzA3AKyqi7R/by7q51qPpkvvdh IZjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5HTKkjlsvO7pfRgTUth2glsjU4eVeg5JumsflCIA0x4=; b=VTUP4O+hW9JR2etn2szLStxpa7dxHfAkbUETLVDM8vff5SWb+in0mAF28hArIrjSTx r8Jqd54dIbDdxuU8JKNnVOtI5uc68ugirq0viuISgEje6c9WQ1dhJUxhd5jvJK6hjhk0 Vbr3GVVCOlh7O6iaHvP5l73nYatfVYTnpXf0D+ez9J8h8aCHFCiVUWBoFXTWq0dmg7YF Me2XORCvXsNmc0cagevgVxqMA+0rb8U2qBiknfXfRSgexDfpV/61AK+uxXTs7QRHihTG uc8zc5EXJW4Ir5sURG5nd0hbcYhL7GjwlZwr51wnM3jqwgQ2lJ6CMJZ/eTjfEaocVfPf VyFg== X-Gm-Message-State: AOAM530PJNodfWjCj8GESEo+IGGduWWnqiQfXnJOTBHYfQi49TOeCkkl kIS3Nn2WZ/CjWAg9LqBy54yVMMS7jp9ZKw== X-Google-Smtp-Source: ABdhPJyLShyG2GVqf3yAOJJ5RrGhMFEuniAVU5apqcJfhOSjuivzPF4NfJD+7494feeWR4Vq+Kpgmg== X-Received: by 2002:aca:442:: with SMTP id 63mr6370761oie.111.1603595635058; Sat, 24 Oct 2020 20:13:55 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id h9sm285490otn.74.2020.10.24.20.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:54 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 06/29] completion: zsh: update slave script locations Date: Sat, 24 Oct 2020 22:13:20 -0500 Message-Id: <20201025031343.346913-7-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Update the default locations of typical system bash-completion, including the default bash-completion location for user scripts, and the recommended way to find the system location (with pkg-config). Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 5d6740c6ff..ba41525373 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -13,7 +13,7 @@ # fpath=(~/.zsh $fpath) # # You need git's bash completion script installed. By default bash-completion's -# location will be used (e.g. /usr/share/bash-completion/completions/git). +# location will be used (e.g. pkg-config --variable=completionsdir bash-completion). # # If your bash completion script is somewhere else, you can specify the # location in your ~/.zshrc: @@ -36,9 +36,10 @@ if [ -z "$script" ]; then local e locations=( "$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash - '/etc/bash_completion.d/git' # fedora, old debian - '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian - '/usr/share/bash-completion/git' # gentoo + "$HOME/.local/share/bash-completion/completions/git" + "$(pkg-config --variable=completionsdir bash-completion)"/git + '/usr/share/bash-completion/completions/git' + '/etc/bash_completion.d/git' # old debian ) for e in $locations; do test -f $e && script="$e" && break From patchwork Sun Oct 25 03:13:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ADF5C4363A for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 541A020882 for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lGTOfQFu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766833AbgJYDN6 (ORCPT ); Sat, 24 Oct 2020 23:13:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766825AbgJYDN6 (ORCPT ); Sat, 24 Oct 2020 23:13:58 -0400 Received: from mail-oo1-xc42.google.com (mail-oo1-xc42.google.com [IPv6:2607:f8b0:4864:20::c42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9B3FC0613D0 for ; Sat, 24 Oct 2020 20:13:57 -0700 (PDT) Received: by mail-oo1-xc42.google.com with SMTP id n16so424455ooj.2 for ; Sat, 24 Oct 2020 20:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gc1Q9mq83rL4UxNSsxew+snHGBCsEDaPG++FrMkYANA=; b=lGTOfQFu/8Wj6OUCC9/qIEEBiJD4aUXbZiQfIkr74phnH5Ohx5i+c1Ty6MZ+afZdfF RxYQwcdSn3l8Ku9lIN/F3YIBZugKSpWZfAtZUchQy/96YWEXitue+B6eKvcd52jM48EY v/zqERd3gS6ZrbS8nuwLl4GIlqtxr9noBFVDGSaPjbZ0rqnlz5R+EN4QAga9o/Uekjdo u5A5zil4NFklFopvqDmqxtGVGjN+forb/YFRCS6fFdPel0oTEUjCWE71pPWuFAV+vt2k 6z/HS+gyQagbrSWDG1XlaUvR2COuvtzxybFBPgsbm80Bu6mdKMyfhV1NyTzOnZTzMxo4 p7mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gc1Q9mq83rL4UxNSsxew+snHGBCsEDaPG++FrMkYANA=; b=k9QuSktOvVH1ILh38Eo7N/k++pz4ugrK4h/CWujWcsYn3G1oaaKMSqWC6lJQqr4kz2 fUAXXESHlRli6TBQF3lZ4d7PBhBLSvoGWsP1ABwhy+FJSWb6hRbcPlQ5yI+Nc6Y8XGGI BH/Lti2AuUSQdqNM9WvSqlADqdKr3EiREuVgwsIZmH4No95nByVLUB6knPgpHcEU252D nbDA8W9PPtSA/Bt2CGJcVcNTM21S7o/Qg+uXFwtGdDvecp95q/4wsgAz9r39CnoBZOTx 2JBoB2eeTzrahRl1vavabxMAwKSR6IIEeFWpc6X8Ir+Td+eP/xTw3Y9aRFuAQiYOj5XQ OtcA== X-Gm-Message-State: AOAM533Lwcyw2QBMUvqUr0y86fJERp0H4UYF4B+agTyJbMVEblXItD+8 qYkU4cLQNZMklF4+py84xf33Y/QOB0ZfdQ== X-Google-Smtp-Source: ABdhPJxH1cmsZDL8Qs1URbFQ/aYLvGagbkGNKHkxlphoGw57UgiVLg/92r0VfVTL1NmMLfzOwYL56Q== X-Received: by 2002:a4a:2f58:: with SMTP id p85mr299304oop.52.1603595636701; Sat, 24 Oct 2020 20:13:56 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id d22sm1837932oij.53.2020.10.24.20.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:56 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 07/29] completion: prompt: fix color for Zsh Date: Sat, 24 Oct 2020 22:13:21 -0500 Message-Id: <20201025031343.346913-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We don't need PROMPT_COMMAND in Zsh; we are already using %F{color} %f, which in turn use %{ and %}, which are the equivalent of Bash's \[ and \]. We can use as many colors as we want and output directly into PS1 (or RPS1) without the risk of buffer wrapping issues. Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 16260bab73..54e123d632 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -97,7 +97,8 @@ # If you would like a colored hint about the current dirty state, set # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on # the colored output of "git status -sb" and are available only when -# using __git_ps1 for PROMPT_COMMAND or precmd. +# using __git_ps1 for PROMPT_COMMAND or precmd in Bash, +# but always available in Zsh. # # If you would like __git_ps1 to do nothing in the case when the current # directory is set up to be ignored by git, then set @@ -553,9 +554,11 @@ __git_ps1 () local z="${GIT_PS1_STATESEPARATOR-" "}" - # NO color option unless in PROMPT_COMMAND mode - if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then - __git_ps1_colorize_gitstring + # NO color option unless in PROMPT_COMMAND mode or it's Zsh + if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then + if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then + __git_ps1_colorize_gitstring + fi fi b=${b##refs/heads/} From patchwork Sun Oct 25 03:13:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855107 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA3DFC2D0A3 for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A48D22260 for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eG9HY9ej" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766836AbgJYDN7 (ORCPT ); Sat, 24 Oct 2020 23:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766825AbgJYDN7 (ORCPT ); Sat, 24 Oct 2020 23:13:59 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04C73C0613D0 for ; Sat, 24 Oct 2020 20:13:59 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id m11so5075115otk.13 for ; Sat, 24 Oct 2020 20:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gM21t5RNgX6Rw833LeyYvcWvxBjeRN/KBdYwBcavsbQ=; b=eG9HY9ejLDL1GYG3X8Tr29VIE8BazUNcu1G9Vp1N+hge9kAnx+bghmyn3gnwrdz+wH /RhhZrxyIxwUF+JNI/wO0mqEF/1W6rJJHl8bfhYT2GEpaeKHWS5bZGkQSFf5H2KMS9Ez AAs+ltPd+NzhUowejvX4yENTHEUNFx0rC8haU5rrD7QJV36h99O8QDD4uF7oC1oAFmYd pbAWdON4hzJsaMg5/jlZFnSuZoqPnTHgu+8+hQz+IyKvUGcTSTrVs1oGSyEZQyyA1gT+ Pvlt9HojC4H+k9pDOYwQjKiLo25d+lIY6RrzY11ANM210Hl1P/aUFgiAEfB+iEuMID6O TX3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gM21t5RNgX6Rw833LeyYvcWvxBjeRN/KBdYwBcavsbQ=; b=heOfOw7WaAT29xk9bBCJFZ9BmaHPBq2/uFYs00siATqA7XzxLbUme/vku6mAGAY1lM C8scADkYd3jRSw4YCC8dpU3aghj/o+qNaWQ0rNgejBfspLI2FMet5VnqexYPvX5D7fcA n6jEuQ3PfmKTTY1/66MuZKCmdqdZNPCkVbmUbOuoEoHkSb7GJw+zZt0ygVIGJ6tfqtCc 4nQDg3jrtl76iKSd8ZVtZVBVy4TWHsbGk3vTF0Jml6ABqiBB3tnuNjbaI2YOknyBADfa 1q3eYGTHIZDx51hU8GcMTEEOzqAQK7LqENF/iCmT9F/nf4XN0nZ1mctOdl50rz1j8mIe FLhQ== X-Gm-Message-State: AOAM533ZtQa7U/YDWm4c3Tr5aVA7QguRx+L49J5VwYJEyz1fXOjNmJ0s c43YTEKIKPV/rjrgz/0qS1T6OiGDXUy9LA== X-Google-Smtp-Source: ABdhPJwXIHGDLbTxPOXWL1+8w3RLjUYvXGr0yQE0nAG4CVnYUPjJv1TqOUR7aMkE5+SiKWNbpYpIpQ== X-Received: by 2002:a9d:3e4:: with SMTP id f91mr8810581otf.244.1603595638212; Sat, 24 Oct 2020 20:13:58 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id 9sm1647161otp.72.2020.10.24.20.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:57 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 08/29] completion: zsh: fix for command aliasing Date: Sat, 24 Oct 2020 22:13:22 -0500 Message-Id: <20201025031343.346913-9-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A lot of people want to define aliases like gc='git commit', and zsh allows that (when not using 'complete_aliases'), but we need to handle services that call a function other than the main one. With this patch we can do: compdef _git gc=git_commit Additionally, add compatibility for Zsh Git functions which have the form git-commit (with dash, not underscore). Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index ba41525373..17041d0b23 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -240,8 +240,12 @@ _git () if (( $+functions[__${service}_zsh_main] )); then __${service}_zsh_main - else + elif (( $+functions[__${service}_main] )); then emulate ksh -c __${service}_main + elif (( $+functions[_${service}] )); then + emulate ksh -c _${service} + elif (( $+functions[_${service//-/_}] )); then + emulate ksh -c _${service//-/_} fi let _ret && _default && _ret=0 From patchwork Sun Oct 25 03:13:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68D6BC55179 for ; Sun, 25 Oct 2020 03:14:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1EE8320936 for ; Sun, 25 Oct 2020 03:14:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZVgoJl0J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766868AbgJYDOR (ORCPT ); Sat, 24 Oct 2020 23:14:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766857AbgJYDOM (ORCPT ); Sat, 24 Oct 2020 23:14:12 -0400 Received: from mail-oo1-xc43.google.com (mail-oo1-xc43.google.com [IPv6:2607:f8b0:4864:20::c43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4ECCBC0613D0 for ; Sat, 24 Oct 2020 20:14:00 -0700 (PDT) Received: by mail-oo1-xc43.google.com with SMTP id v123so1555287ooa.5 for ; Sat, 24 Oct 2020 20:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jtR+pU9ehZJVaRdI0ewS8VlmChzN75RxQJ9UCA6Faqo=; b=ZVgoJl0JIUWoBfW0XAKZxS3gYF98Z70j3bgx1KHaKXTIiOEfs07q0ROi76eFt+Z+KF 0piUoHDzYY2SYTpXxnkIH96ribZtngSs0qcinRQ9diItPUr1CNFLcFTIYytcuBtbdb5t bRaoCX0Jc0hWnKJ2qTJ8AiB9quaMFi+iWhQ9VLfd2Ct62mRyL/3AjuHUV7hPsmzf+a8b z8y4NfWTsCRRWIp/ZPmDRB3WJNUkdY2AYF4SgH7pwQoN3c4ewkTEcVu93mNoGxD22Amu TGN4MmdD0/FSjKt/Fi4hTOlXijFObnbZcs+JjGrDptrYMg+RsQ0VqlFJbenATU8hjo5z Jk/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jtR+pU9ehZJVaRdI0ewS8VlmChzN75RxQJ9UCA6Faqo=; b=Iyl+3Vr+aR+84E8oLHQ94gcl0Hgjmrib7e4zxEoodMDkqotBUyKUlTZGO22NXDlSlt CAgMsPd7P5wXVkzIGnQNddcNL1WYzkAe7So2k/zbCRTSLtGGXJk0UPfeifV6M7ss2iQ/ cyE06topWb7m3DxJErcK8WzUqnSQeMtPJYfh2NLJ7F8RC3rh0+xAa5gOUWvUr/ZYmle/ 1j4wDot+hH5/bp5GCY5hasvmfBTj5J/FoLigT1xwXb7BvrxqiHLxaJW+VIPs1mW/VlJU 71TZCaTwHyzxgl3u32ZSWp1J5aWxjD2oZuaekMBLXqj9VSzN5Ff2z6qNFDiNaSpEh812 otdg== X-Gm-Message-State: AOAM531viUeZB5XY5zJf2lFnDrTW0S+IZMi8wJnKlaRqRtfBKqiTyGjt GF3WbJ6oTku9z2JZAX523eSq63MHATy0yw== X-Google-Smtp-Source: ABdhPJx292uQnianSCIGYotPj5FkKbYJXpcR8Z+arV6vP+IYB0gxlvA7J/y9rx0kXnLCSs8bsmdH9Q== X-Received: by 2002:a4a:b34a:: with SMTP id n10mr8527284ooo.46.1603595639539; Sat, 24 Oct 2020 20:13:59 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id z12sm630514oos.12.2020.10.24.20.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:13:59 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 09/29] completion: bash: synchronize zsh wrapper Date: Sat, 24 Oct 2020 22:13:23 -0500 Message-Id: <20201025031343.346913-10-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A function was missing. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ec7dd12a41..40affd40e2 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3510,6 +3510,14 @@ if [[ -n ${ZSH_VERSION-} ]] && compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } + __gitcomp_nl_append () + { + emulate -L zsh + + local IFS=$'\n' + compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 + } + __gitcomp_file_direct () { emulate -L zsh From patchwork Sun Oct 25 03:13:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855109 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1CADC55179 for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9BFA320936 for ; Sun, 25 Oct 2020 03:14:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oq3X1xuN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766842AbgJYDOD (ORCPT ); Sat, 24 Oct 2020 23:14:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766837AbgJYDOC (ORCPT ); Sat, 24 Oct 2020 23:14:02 -0400 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA651C0613CE for ; Sat, 24 Oct 2020 20:14:01 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id 32so5123640otm.3 for ; Sat, 24 Oct 2020 20:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZO6KUkuVfULWoaGZ56IxJadVwdlwGesrdAW4aReFdO4=; b=oq3X1xuNVT3tLmtinW6XCxXUvs7W1ewxX0UurKBF011lAOV+kUfZ/ZKg7d1i2Hkxr5 o+qgYhciHDt02lJwk0aM8D1z/+EC3OUI+TgfSeBIzaw6opG9Bx/YEylHKAFNxJMMlGKF 9wX0d3Lmvpp5xv/tTN9Hxg5iaDontP5dLxDWOINGZPYt+19SBnOU63j0xubi1kb4tE80 ASTCS7JpQltmtQ8fE2l2c3flkuZclTs4o9YBDGLFmeGwIHwwl4EECFymCMDvRZ+/kXRU 8iQuC7jAx//rMWt1/cVah1DAcbG5dfW2P1MNBaRTtlQeMMwBa4CwDiSVlwxObr39Z+Cl 3geg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZO6KUkuVfULWoaGZ56IxJadVwdlwGesrdAW4aReFdO4=; b=rcqpyDX9saqHUnE6hHuw1emCaaERnEe3tUBMEiq4kX7bMZeCd+pqnhxdMaC0zFdXF/ hPXOqaYUbDQjjDH3IuYIxTNr2qhfkTTAjtaTzVSdfrSDnVkNK+2iZ58WFQmfLuqpOxqz lbeJpLr05pkVmeNvsuXvsdqHs+lWlJrjngEsrGGi5fOYd9y9mHfy5YCattg9aCsUX6c1 TeLlm0kGZ58nzIRRrdcHDKYnLVV+KH+I1xprtwq+teURV3URKbpY8zbaME3oiohK+LZC gcECw0EoMBSD7AvNPefs8kuFUDoxwDphas6EoKsYKNhp24QT2xspUmyMtOgdJjNmFBcf LCNQ== X-Gm-Message-State: AOAM533ialQq6MSoWSS/FJexXNbFiOuUSSVUrbwrHdugqRvvOHwc+bun fIFeT2v2oikUkAi67dtysAkWvXhBX0wG7Q== X-Google-Smtp-Source: ABdhPJwdzwehgu1L/N/0LhnPvI9jfgMMapUDJ8/mVMbtysv3XfxXX3trW/SGQqaPLIpfINY/fxOMEA== X-Received: by 2002:a9d:4f15:: with SMTP id d21mr6551959otl.166.1603595640963; Sat, 24 Oct 2020 20:14:00 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id m65sm1680258otc.36.2020.10.24.20.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:00 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 10/29] completion: bash: remove zsh wrapper Date: Sat, 24 Oct 2020 22:13:24 -0500 Message-Id: <20201025031343.346913-11-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It has been deprecated for more than eight years now, it's never up to date, and it's a hassle to maintain. It's time to move on. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 92 +------------------------- 1 file changed, 2 insertions(+), 90 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 40affd40e2..26d6ee20b0 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3458,96 +3458,8 @@ __gitk_main () __git_complete_revlist } -if [[ -n ${ZSH_VERSION-} ]] && - # Don't define these functions when sourced from 'git-completion.zsh', - # it has its own implementations. - [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then - echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2 - - autoload -U +X compinit && compinit - - __gitcomp () - { - emulate -L zsh - - local cur_="${3-$cur}" - - case "$cur_" in - --*=) - ;; - *) - local c IFS=$' \t\n' - local -a array - for c in ${=1}; do - c="$c${4-}" - case $c in - --*=*|*.) ;; - *) c="$c " ;; - esac - array[${#array[@]}+1]="$c" - done - compset -P '*[=:]' - compadd -Q -S '' -p "${2-}" -a -- array && _ret=0 - ;; - esac - } - - __gitcomp_direct () - { - emulate -L zsh - - local IFS=$'\n' - compset -P '*[=:]' - compadd -Q -- ${${=1}% } && _ret=0 - } - - __gitcomp_nl () - { - emulate -L zsh - - local IFS=$'\n' - compset -P '*[=:]' - compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 - } - - __gitcomp_nl_append () - { - emulate -L zsh - - local IFS=$'\n' - compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 - } - - __gitcomp_file_direct () - { - emulate -L zsh - - local IFS=$'\n' - compset -P '*[=:]' - compadd -f -- ${=1} && _ret=0 - } - - __gitcomp_file () - { - emulate -L zsh - - local IFS=$'\n' - compset -P '*[=:]' - compadd -p "${2-}" -f -- ${=1} && _ret=0 - } - - _git () - { - local _ret=1 cur cword prev - cur=${words[CURRENT]} - prev=${words[CURRENT-1]} - let cword=CURRENT-1 - emulate ksh -c __${service}_main - let _ret && _default && _ret=0 - return _ret - } - - compdef _git git gitk +if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then + echo "ERROR: this script is obsolete, please see git-completion.zsh" 1>&2 return fi From patchwork Sun Oct 25 03:13:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E780C4363A for ; Sun, 25 Oct 2020 03:14:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFA8E20936 for ; Sun, 25 Oct 2020 03:14:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dFk/ls7Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766891AbgJYDO1 (ORCPT ); Sat, 24 Oct 2020 23:14:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766874AbgJYDOT (ORCPT ); Sat, 24 Oct 2020 23:14:19 -0400 Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16BE3C0613CE for ; Sat, 24 Oct 2020 20:14:03 -0700 (PDT) Received: by mail-ot1-x32a.google.com with SMTP id n15so5085482otl.8 for ; Sat, 24 Oct 2020 20:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L02rjo4+/MtLroLh7HRKhtTUinqFIjVhSsYyby5xYBc=; b=dFk/ls7Q8q6g8R/cr2O463bdyH3MVUqW+RlfEhTj6D0fx/CgXpkWcEp8hcWgYB1Nt4 bCF2RpoePVQzhD4m31pi0yO66pCmIdcHehJ3Ww/ESizvOUdiQ8tHbCcXL3K8c2AU0UWW Oa/mxILBuX6Hvog95HXMUlm79vUmR5Kx+OUigSxKalQNHMNF62PzH2S9fb5KUXqwU9Hy SeQHMvm83E+spFuIy6SopuFXPcWEqAHldKPhUOFCtkUd1G4BfJbCO5dScc82m7Qe2L4r JIj0o9RSMsQ2gSS3u8jpJY2j8OHiomSnEn5XPcoDRJCuO/mU4IvHCzi3o9S6EBm19Iyc +8OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L02rjo4+/MtLroLh7HRKhtTUinqFIjVhSsYyby5xYBc=; b=a5qmv1dSu24YJceRyzRL/EB3xR+QUa1G4ETmKl6vUieD9wRzmZtIwIr2g6xNGlXR5c 5K75qq5r3tan6b4r4u2BVbH9mFg3pF9F1CN1hO7l7LaVAiFtttHIF7RsdRjRg98icupY s7VXa0s0T9C/NuZmlQnC744XdvBFm0CrCRAwgZBtg84WJQYLy1IkWXF0AEn3tHLHdTGN DOJ4QXy80wzG0JKwk0usm25jNAfz6D1MWP15DNPdvWJoELcURl9mD7/u4p3s95YiEABO 6moP2y8MzB6+9Ov0pCS8WibnTz04nnNvYCsobfd8Y8u6xSuIURxX2SOblWHWwdapYy2T W+4Q== X-Gm-Message-State: AOAM5331UhrR8yZwzryvpEx8tFIx0tXoAoCdknofU7fTn/7ig0PtmXPP BgH2y8ppikckU/Vfr59OaLIVQlVNnE45Og== X-Google-Smtp-Source: ABdhPJxGDetCiKQG7pIE9Ie585P+Qo+5peoRrQ79EBTB05Njtkaxn6bGxRhseYnUU5M9bHJm86VpWg== X-Received: by 2002:a9d:6005:: with SMTP id h5mr6545188otj.87.1603595642296; Sat, 24 Oct 2020 20:14:02 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id k22sm1872217oih.24.2020.10.24.20.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:01 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 11/29] completion: zsh: fix completion for --no-.. options Date: Sat, 24 Oct 2020 22:13:25 -0500 Message-Id: <20201025031343.346913-12-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This was introduced in upstream's bash script, but never in zsh's: b221b5ab9b (completion: collapse extra --no-.. options) It has been failing since v2.19. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 17041d0b23..c2a90beb8b 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -56,10 +56,32 @@ __gitcomp () case "$cur_" in --*=) ;; + --no-*) + local c IFS=$' \t\n' + local -a array + for c in ${=1}; do + if [[ $c == "--" ]]; then + continue + fi + c="$c${4-}" + case $c in + --*=|*.) ;; + *) c="$c " ;; + esac + array+=("$c") + done + compset -P '*[=:]' + compadd -Q -S '' -p "${2-}" -a -- array && _ret=0 + ;; *) local c IFS=$' \t\n' local -a array for c in ${=1}; do + if [[ $c == "--" ]]; then + c="--no-...${4-}" + array+=("$c ") + break + fi c="$c${4-}" case $c in --*=*|*.) ;; From patchwork Sun Oct 25 03:13:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7AF1C56202 for ; Sun, 25 Oct 2020 03:14:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7533920936 for ; Sun, 25 Oct 2020 03:14:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VVciddwC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766845AbgJYDOF (ORCPT ); Sat, 24 Oct 2020 23:14:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766837AbgJYDOE (ORCPT ); Sat, 24 Oct 2020 23:14:04 -0400 Received: from mail-oi1-x242.google.com (mail-oi1-x242.google.com [IPv6:2607:f8b0:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 789F6C0613D2 for ; Sat, 24 Oct 2020 20:14:04 -0700 (PDT) Received: by mail-oi1-x242.google.com with SMTP id u127so6939219oib.6 for ; Sat, 24 Oct 2020 20:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=izhR51gTfbtoViguCJVykzb7Oxsc3oGRsw7aRL5pm0s=; b=VVciddwCmumARk8/f6baAcy6jbkWCwyyjLDkCO8foziEIkdCDXcRdiFZ6Rb8OQhtPI 4OSbMRHsgMZnjzyMnD0VCCLmaZkCVE2WIsOa/GW1muQjfxR780qp9UyDNWb3RBgxZqh1 nY+FyX2WGf8ftkZ85OLgrl+pOaO2C+fd7YJEFtof4OerWbwJasUSLgChW94IY6YqwI/g cs/tWcHWK0qsFcu0Y1XeSGCNDSYKMYbsyVnuDsqiNZA+plZKWvjAESrP743cwQ17L02L ifd3XMcdwJr2iBMDhGgKVLGus+ssCNxUwdDzVPYmhz67dHPvGSb3Mk/n707oTkz1GqU8 bumw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=izhR51gTfbtoViguCJVykzb7Oxsc3oGRsw7aRL5pm0s=; b=uFpAz0Mz/JnJmwOkx0twETrUl7ODJ/Akg5Bxu0k7fu0MGqA7W+xAAoO2CaHP7+g3zb zG71fJ/ovDHI5p+xoFpN1FHip++SmWqkRb40/VaoF/bObfYpUZLhLiOj9a0/8a1mKNNd 2LGrznjCR3vYgr/IRa6oDEjFtmeRjoo+Gx8P9pE55RBCz1+lY3BjnamIuRCOnUW5GrwK rn2dulsNdSgQQF5XTYYrZDDvGF0gIIsjOcuZt7LiM9/5vNltAi9FBbhKp5SaaUbIqdG1 h/Ia2DiD7+/gwiV/T++5n5w9rOuYA7GM0UQ/ZYrp8tXUKS4vu82/8KrWD9JhNZoEkgUq oFbw== X-Gm-Message-State: AOAM533j4VwCTxckMYOX64Y35ASJg4bh16GsVlXWxGSWWhiiYr7NQaiI 5RzNMzVnLu8AIPZQzkr+b6er6kq4kdILow== X-Google-Smtp-Source: ABdhPJzFQq8ANRESicebXhI3TVxOu4aXxsq7mUxWX99pmQfTT9+ZWiBB4kg8A+LWtJt3XhOYqMw2sg== X-Received: by 2002:aca:d7d6:: with SMTP id o205mr6468582oig.165.1603595643681; Sat, 24 Oct 2020 20:14:03 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id k51sm1670959otc.46.2020.10.24.20.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:03 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras , Mark Lodato Subject: [PATCH v2 12/29] completion: fix conflict with bashcomp Date: Sat, 24 Oct 2020 22:13:26 -0500 Message-Id: <20201025031343.346913-13-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We don't want to override the 'complete()' function in zsh, which can be used by bashcomp. Reported-by: Mark Lodato Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.zsh | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 26d6ee20b0..6de0e7b482 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3475,6 +3475,7 @@ __git_func_wrap () # This is NOT a public function; use at your own risk. __git_complete () { + test -n "$ZSH_VERSION" && return local wrapper="__git_wrap${2}" eval "$wrapper () { __git_func_wrap $2 ; }" complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \ diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index c2a90beb8b..1de9b9c80d 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -21,12 +21,6 @@ # zstyle ':completion:*:*:git:*' script ~/.git-completion.bash # -complete () -{ - # do nothing - return 0 -} - zstyle -T ':completion:*:*:git:*' tag-order && \ zstyle ':completion:*:*:git:*' tag-order 'common-commands' From patchwork Sun Oct 25 03:13:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855105 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0339C4363A for ; Sun, 25 Oct 2020 03:14:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A04AA20936 for ; Sun, 25 Oct 2020 03:14:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QYjafKpJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766848AbgJYDOG (ORCPT ); Sat, 24 Oct 2020 23:14:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766837AbgJYDOG (ORCPT ); Sat, 24 Oct 2020 23:14:06 -0400 Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8F88C0613D2 for ; Sat, 24 Oct 2020 20:14:05 -0700 (PDT) Received: by mail-ot1-x343.google.com with SMTP id k3so4535434otp.1 for ; Sat, 24 Oct 2020 20:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DXiYcWh3hiY/S4WM7hZoTPrcumnh/IZyKZfCrgKGXBg=; b=QYjafKpJwCm0Dym5H/q8adWPUIvpOgJukaNEidZU4Qn45di1j9ozOdadYbgs+MztEs pQwB0+d2rFXcBvEkxlLriweVnQFzRFqX+ZTAseVz8Z0+gej4Izes5z8BMCIZZGn3qfUi HQQuHQ/+2hdoDfT+w9no6dLstvmeU4i+mj29O7eNT6r+W+sQZFwKD+QcGHhTp7+V6TPn +yVM1htC0Q1xDEUJP8Y1/dH4nmPomOMH/BNcjpF7BOm5Yovi0UDSRiF17HPRmgvALu6/ cvbSomtqKAggtTIoc8+sZ0aCmVlBPBR91R0A8/UPWpMkeAIXwE5zWiEF7mEj030qnF96 YH+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DXiYcWh3hiY/S4WM7hZoTPrcumnh/IZyKZfCrgKGXBg=; b=BR/04LVvRUR9QmJM/HJB6oPHUNHiRGbGmeAlujWaZ5guzGSfx+dpLEXr9fnsG/c0f6 fyq6Ef+wbclsll1qgwuTTCjMWpOfm8jnrJgVwDuF/juBe3Qh5ReZq+H/pYKGqphpr0pF 7oKuVs/8FEMv+qa5iI2QZcQaFTIRP8CF/8MokgF06ReDVEb2myhKQq1aTwpqejMBeFEk NcRMqsu//kxK4jd5dEMgTP8yBUB07iRivv/yJZnMGv/eD1ITN46r2rMUd0sjek5ZN61M IVW9hzaYLGVTB1bGtHO2IDVBV4ZwwcIEDVBXWKgg2AE2Yk6GiF5P7O4Gg3PzyDay6Fwd oRLA== X-Gm-Message-State: AOAM5304rr4tM8ltCZJ0ppR9sky0q2raAVwv5KhS7knJUNT2exnbYPbp 74vNjXVmOmoc0PnK86MCRvOzCcQalduZyg== X-Google-Smtp-Source: ABdhPJzyG+KrnMucCngNnKH5gSCIDq5qZr0rV6EQ7a6ycAmwl46Jr/Mp6d7fRN8FeQotIGK9Qm8SnA== X-Received: by 2002:a9d:5cc:: with SMTP id 70mr8916604otd.34.1603595645090; Sat, 24 Oct 2020 20:14:05 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id b7sm1840328oic.36.2020.10.24.20.14.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:04 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 13/29] completion: zsh: add missing direct_append Date: Sat, 24 Oct 2020 22:13:27 -0500 Message-Id: <20201025031343.346913-14-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Commit 688077910b forgot to add the corresponding zsh function. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 1de9b9c80d..13c6bd5c12 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -98,6 +98,11 @@ __gitcomp_direct () compadd -Q -- ${${=1}% } && _ret=0 } +__gitcomp_direct_append () +{ + __gitcomp_direct "$@" +} + __gitcomp_nl () { emulate -L zsh From patchwork Sun Oct 25 03:13:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 040A4C56201 for ; Sun, 25 Oct 2020 03:14:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD7F620936 for ; Sun, 25 Oct 2020 03:14:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="enq7MZyH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766856AbgJYDOM (ORCPT ); Sat, 24 Oct 2020 23:14:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766837AbgJYDOH (ORCPT ); Sat, 24 Oct 2020 23:14:07 -0400 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94EF0C0613D2 for ; Sat, 24 Oct 2020 20:14:07 -0700 (PDT) Received: by mail-ot1-x342.google.com with SMTP id n15so5085550otl.8 for ; Sat, 24 Oct 2020 20:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o5rowoouxDn0zguYYXN+F1arqo5oVWDt+w2FmFsvk0Y=; b=enq7MZyHcRb9IW0RmHTYmviXfJXbILelL2qJHSxOc9Zk7cMtnfd8tUqTR7PbxYN/06 hxbM9yu/ZGHcKte8hj/LNXztZbw2NcBaJejOgWnz1PFYw4uSzCaG/vCZnsGjpPQSwW18 6/34z9fcuaO4lFoR7NpORbJIl1peu3Hy3sB8E77z3Kt1Q6F8d+x9M7BULGY1rwXMs56R Y5YkJt2t0qlbKkbvcqFnmL6/jiwvncJEleyITqx0cRcpMUVsRivgL2niqqVjs+xslcmT zbCQN4xzHeJVbCdqPHiW9Jz/AiiOm2POJFItfS4Xw0w900u+Fh79/NCLxF2E0s3xU8+V k3fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o5rowoouxDn0zguYYXN+F1arqo5oVWDt+w2FmFsvk0Y=; b=Do0S6bVnRMlJMVTJ6OGXuE0HHe+J/iQ+TlNoVBxElSU6dE8Nxa/spqTm/qbifdVPnW dHGd8Tsmbdj1iC+ocRN8mXuOI1idoUd5uLpcgMyWEaLhrPKSHeFBnWj9sbkfy9JOPCIZ gYyc00v7GIe700MbF0omfUPWI/p65i1STK3jsXBrA4cdMVlRtFD53uxRx4AR4j4s42mz duOYHNW9/NbaBz/JLTtU99kNkh28S/2U+mNpqnznbTR6QSQS9Tb5oe7ikwlGAlXso91F v4prXOC3sitqWhWhB8WfzkxRvL1AyjpaPyQvWfb13merStGL2E8mxu8dK8z18cnPNfto +1bA== X-Gm-Message-State: AOAM533uk4oGOTbYo6/MhcRS4BZUJ3Jt6mQWOOmZH6BfGN/Zzvalbc1d LPLmARze+BBAU+tPYXlLXsSGjPzfJpwMNw== X-Google-Smtp-Source: ABdhPJx0KH75jFyl/keMV6oKkvtQ+/JjcCuiuFB3IBP039dwktGcTMKyV1PdEUSx4vi+DaucNeat4w== X-Received: by 2002:a9d:7419:: with SMTP id n25mr8144170otk.183.1603595646820; Sat, 24 Oct 2020 20:14:06 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id b16sm1655544oti.4.2020.10.24.20.14.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:06 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 14/29] completion: zsh: fix splitting of words Date: Sat, 24 Oct 2020 22:13:28 -0500 Message-Id: <20201025031343.346913-15-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Files don't need to be split by '=:', words do. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 13c6bd5c12..088bf7f759 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -117,6 +117,7 @@ __gitcomp_nl_append () emulate -L zsh local IFS=$'\n' + compset -P '*[=:]' compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } @@ -125,7 +126,6 @@ __gitcomp_file_direct () emulate -L zsh local IFS=$'\n' - compset -P '*[=:]' compadd -f -- ${=1} && _ret=0 } @@ -134,7 +134,6 @@ __gitcomp_file () emulate -L zsh local IFS=$'\n' - compset -P '*[=:]' compadd -p "${2-}" -f -- ${=1} && _ret=0 } From patchwork Sun Oct 25 03:13:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855111 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FC40C2D0A3 for ; Sun, 25 Oct 2020 03:14:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2990A20936 for ; Sun, 25 Oct 2020 03:14:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PyGBwbta" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766859AbgJYDON (ORCPT ); Sat, 24 Oct 2020 23:14:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766849AbgJYDOJ (ORCPT ); Sat, 24 Oct 2020 23:14:09 -0400 Received: from mail-oo1-xc42.google.com (mail-oo1-xc42.google.com [IPv6:2607:f8b0:4864:20::c42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18D40C0613D4 for ; Sat, 24 Oct 2020 20:14:09 -0700 (PDT) Received: by mail-oo1-xc42.google.com with SMTP id v123so1555337ooa.5 for ; Sat, 24 Oct 2020 20:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YkhluwteQ5rcvV0BPWK7M7XpbHit4oZpMwJLu5ec1Do=; b=PyGBwbtaNyWbFCJUJGJvErinoqc2l452xT/vQDQEFvzurJl4JTjkw6njKhqSLaadxj 2qMsXx5MMn9PkjeD+3oKnnKQ7GTgNOokTGRyH2TFyXW4CNIZI0bPubb2tU+l1ugOa5V2 hFksyVOlGPJe988VkC4a5g3YtkVHjlCOrIhEW/0lW6TqwA35iNEabCNsfwQ+/fcc5KiE ZJvCQ1DxmiTWIe0DZ3lnVwbp+NQ6GStovHnVI82qtEcF0X8jxgjQ9nGPdT6xXmt2KejS 3TVxqB2InO8QHerx62I4BjbwZuBFw7I+NB4VRC3HV0FZhPj4XibjDpu878NU8tTDero6 +V0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YkhluwteQ5rcvV0BPWK7M7XpbHit4oZpMwJLu5ec1Do=; b=SSzXN7c6ZTvZZhYp4tXlDCIkIXWOULpD+Ju1hk16vm1WZZX7J4V5PBCdT8VrJDBjo/ +SrTlRvOfLMHCWNGr7JUUjcKiUViBmsympQMZ2gWeEuSjq0CuV2pGkKCi+WyOxk8qmfZ djEZJcywbk+n06yN8WFVdxXntmIxlIQ1AAVZTW8xfRRNE0K6Z/DH4oQUZ49bM26e2Dn7 KC7IAj24erqUnZtrBCyeC0xnEYGhPMQi9Vyqs1qI7qM7eDggFNzi2Z7zaDuj0WUctJEb eQSq6T7BrIc+84tE8+hEI/T4bz9AnKLpnuGNM5N1Ck8B+VLhEc84da7s2m79C7RWkJsf e3UQ== X-Gm-Message-State: AOAM533OJHwCEE0pcl/PN75WwfToQMKajYAqQsI2gWPKihuY3ef9Xwnv 3C8WPZqMjIhEOiRB+PJtpfJzBfdm0jVnuQ== X-Google-Smtp-Source: ABdhPJzk5JKehiMOdskpP9Mk7hPetVnqd5npN4RUVsW7BTyX2+c5cCeo8p0sF8LUCMaUpzT2+H5Idw== X-Received: by 2002:a05:6820:30e:: with SMTP id l14mr8119667ooe.57.1603595648256; Sat, 24 Oct 2020 20:14:08 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id u26sm1702325ote.60.2020.10.24.20.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:07 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 15/29] completion: zsh: simplify compadd functions Date: Sat, 24 Oct 2020 22:13:29 -0500 Message-Id: <20201025031343.346913-16-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We don't need to override IFS, zsh has a native way of splitting by new lines: the expansion flag (f). Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 088bf7f759..2f20fe386a 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -93,9 +93,8 @@ __gitcomp_direct () { emulate -L zsh - local IFS=$'\n' compset -P '*[=:]' - compadd -Q -- ${${=1}% } && _ret=0 + compadd -Q -- ${${(f)1}% } && _ret=0 } __gitcomp_direct_append () @@ -107,34 +106,30 @@ __gitcomp_nl () { emulate -L zsh - local IFS=$'\n' compset -P '*[=:]' - compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 + compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0 } __gitcomp_nl_append () { emulate -L zsh - local IFS=$'\n' compset -P '*[=:]' - compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 + compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0 } __gitcomp_file_direct () { emulate -L zsh - local IFS=$'\n' - compadd -f -- ${=1} && _ret=0 + compadd -f -- ${(f)1} && _ret=0 } __gitcomp_file () { emulate -L zsh - local IFS=$'\n' - compadd -p "${2-}" -f -- ${=1} && _ret=0 + compadd -p "${2-}" -f -- ${(f)1} && _ret=0 } __git_zsh_bash_func () From patchwork Sun Oct 25 03:13:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855117 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2188EC4363A for ; Sun, 25 Oct 2020 03:14:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC8C420936 for ; Sun, 25 Oct 2020 03:14:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PhOinPD5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766853AbgJYDOL (ORCPT ); Sat, 24 Oct 2020 23:14:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766850AbgJYDOK (ORCPT ); Sat, 24 Oct 2020 23:14:10 -0400 Received: from mail-oo1-xc44.google.com (mail-oo1-xc44.google.com [IPv6:2607:f8b0:4864:20::c44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 997F1C0613D5 for ; Sat, 24 Oct 2020 20:14:10 -0700 (PDT) Received: by mail-oo1-xc44.google.com with SMTP id j6so1552412oot.3 for ; Sat, 24 Oct 2020 20:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DNIK1e9CQuZfwAqrisDNxC3kemDUT/aDUy5+puQzhOY=; b=PhOinPD5YOXfyeubd64bfkXE2Dg+OkNXkRu4ycgaq0OIDYxBC5FD4pEeyVh3HqkA9e Vng5c7EOEG7MLTWcOBO7xBwf4OoXw2OSozFtfv8/9Dy4nLftupa2h8Gk+hRMLLuO8fY2 LobO//vZHlhu1mfFspd35Q5tknPX9EJbwyH5ksVHUdrxHe2O+WCHjLU9xg/lDeCEymNo vpJAcpn0BIku9hkf+gx7MZZaxL7XK3lzEaxedUuUOQXsbbG96ArsqBG3t5E9saribO/U 2mCcmYzN8SV4A5UGLRymMClonzOst+rZqejXMeF7M1KBfxdhBqxXLcQUOkN7BHcc1Lzb LqMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DNIK1e9CQuZfwAqrisDNxC3kemDUT/aDUy5+puQzhOY=; b=KvQtdyZxrWQXJYAJKbr4Zvl1xNgUFmLBZ4w7j5Cf+spt13gxpj7kFg5W2DOTICxsG9 ZVdH9DTOw6N34crl+viFU/PycCnliPSwJg6l0SMWhoGwwJISNrse7gw2UpDQuMJ0gqIa +FIMuZC2eUhVrXAUqTRSFkZK4arMq6ACM4zLVpcDG+zpjBh7tF/COSnjrBmXX3TbJoeT p3oa9X74jvr8IHLkyGJhiz6AN/aNVHNQsNLoJvYaVjbAutjYuJs6s+tc59+JV7JX2Oxn ukdp/WtjIsmKhGrNpFITxTAN6l2VLi89BVVdt95eeGcCH/MRhKJQ0LLJyuJDG93OOZN+ wE/g== X-Gm-Message-State: AOAM533/bRTBTSZA6JByVrTgvFqdkjmSwKV87P7UQTmhUbsH7qrzSNyH oEG1unbAnhy/HIRjjBb+moLOE21lREQZwQ== X-Google-Smtp-Source: ABdhPJy45NhoEHj+f0IRcwx0O8fsQtDPv03OQ4cuuGQe2wMpucPtURWatVqxzxHXq9COw1KfInpyoA== X-Received: by 2002:a4a:be92:: with SMTP id o18mr2832840oop.22.1603595649752; Sat, 24 Oct 2020 20:14:09 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id e78sm78875ote.50.2020.10.24.20.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:09 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 16/29] completion: zsh: simplify direct compadd Date: Sat, 24 Oct 2020 22:13:30 -0500 Message-Id: <20201025031343.346913-17-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Instead of manually removing the suffix so zsh can add its own, we can tell zsh to add no suffix, so we don't have to remove it. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 2f20fe386a..b955404fdd 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -94,7 +94,7 @@ __gitcomp_direct () emulate -L zsh compset -P '*[=:]' - compadd -Q -- ${${(f)1}% } && _ret=0 + compadd -Q -S '' -- ${(f)1} && _ret=0 } __gitcomp_direct_append () From patchwork Sun Oct 25 03:13:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855115 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C35F3C4363A for ; Sun, 25 Oct 2020 03:14:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89F2520936 for ; Sun, 25 Oct 2020 03:14:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TAGv9BbB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766863AbgJYDOP (ORCPT ); Sat, 24 Oct 2020 23:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766850AbgJYDOM (ORCPT ); Sat, 24 Oct 2020 23:14:12 -0400 Received: from mail-oi1-x244.google.com (mail-oi1-x244.google.com [IPv6:2607:f8b0:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10EBFC0613D2 for ; Sat, 24 Oct 2020 20:14:12 -0700 (PDT) Received: by mail-oi1-x244.google.com with SMTP id u127so6939386oib.6 for ; Sat, 24 Oct 2020 20:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F2SZImvX+yzbkeHz8OzQRaJp2Im0l1+jrbI5zlIzL4Y=; b=TAGv9BbBW//JFq2UroZp7aemK3qw1VOx6ldvMwQJQ42ANCllwgg3rhtWUJPicfdUVh gloa/9fgtSgxj30Vl7k5+3L+l5c6se6zDGF2cOIgAQAxj60waakeWs5d0FMrlMBFy2UO IvPDZHLXMfXP8gXr5onZIvp2s1Vgdri9xZUYsgaRDvawqa72UIE1CNmh5gMrVPqsQxKY IovM1UZYzPA99eO4vugDIBj0K6nk4MHgD6kF5FA+8s/3i5UnYTAZ0dH9xVFIgOWasS58 0jDr8eTAXUPQBgCf0TFV0jheQVmsi1BeBJHifhEkjQXNUZT7R8Tgd+VbuRf+Fh4Ze1ZI ex3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F2SZImvX+yzbkeHz8OzQRaJp2Im0l1+jrbI5zlIzL4Y=; b=HY5njbGWvyUijjXAS8zaHtcJ07CBIc5esns68QWsWTPORy5QH62oNiE+dj9lhylFIm nWwDwVgNeKrMNgt1+Wu7VWdS9wB61W4j0UTYA2lo/IB/SfIgPMONzeMsYoFmnds3ik3X MS29hN1t8gqXwG1fuAPSJrpBbDKP9jD2jwXOhyfyLIut8p23fbpzSr6pDhxFF0mwB9qD jOLElpQwx1qUef0w+itF5dLIpKIxifyq7UPHH9NWfeetsiKIlJ1xU3B6KHuhlH7TapbY ByfkSCAiQGCmXeCgZ5xQHtlFj0vMSY30FhxI5TR/aTZ2tiMw/kYX/xaNitU4pVRiVk95 2AHA== X-Gm-Message-State: AOAM531gXc0sei6pW6lkGAmRtFIWAu4xXqDZEq6DOQJPLNsgOzt23v1+ QFD56I0tB7zFb4qnY7Wk91OEBUkcoCCXzw== X-Google-Smtp-Source: ABdhPJzaFznoXwsX3SLgv0lPMrFzG9fDO+T1aXSpUJJrCSRZCqQomUb514YD11KWZNjK5RmMj/kdJg== X-Received: by 2002:aca:b588:: with SMTP id e130mr8378005oif.56.1603595651320; Sat, 24 Oct 2020 20:14:11 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id q10sm1864082oih.56.2020.10.24.20.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:10 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 17/29] completion: zsh: trivial cleanup Date: Sat, 24 Oct 2020 22:13:31 -0500 Message-Id: <20201025031343.346913-18-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index b955404fdd..f0babc784a 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -129,7 +129,7 @@ __gitcomp_file () { emulate -L zsh - compadd -p "${2-}" -f -- ${(f)1} && _ret=0 + compadd -f -p "${2-}" -- ${(f)1} && _ret=0 } __git_zsh_bash_func () From patchwork Sun Oct 25 03:13:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93F4CC4363A for ; Sun, 25 Oct 2020 03:14:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 55BCB222C3 for ; Sun, 25 Oct 2020 03:14:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="clsrljqL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766871AbgJYDOR (ORCPT ); Sat, 24 Oct 2020 23:14:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766860AbgJYDON (ORCPT ); Sat, 24 Oct 2020 23:14:13 -0400 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9283AC0613D0 for ; Sat, 24 Oct 2020 20:14:13 -0700 (PDT) Received: by mail-ot1-x342.google.com with SMTP id b2so4539373ots.5 for ; Sat, 24 Oct 2020 20:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TByR5ou9H4c0OYKGXvNNbjYTl32Va4BokotCm+HNExI=; b=clsrljqL5AxXE7ENzt0gBPpuNtAO5ML9Ve2kvBy4rccNM2Ikkh5OLtk94aLP5bNc9J 8Wa/c5aGq1d48YEyACqLFqX2hP5ew8++xO1NTR0+CIWmjRvwBxPs5AZyfDlPDpzhBenb Ri6OwJpYjwnRO5ZCqJIsW4jQ/rN9rOcRH1glOf+eb75i15r52kHt1ayyOLairfoyfASZ 4oxCxmOjsnyvZtyzSRh7fzjRD2Cs9B8fcFNcX4+lohUTO1V0UhJfgN97YFGJtGTvVOfr dqqfXqvd8d5ThVbXPGigK6y1J8Snj6ApIuj9p+mOfmP9+G+GBkBz8vTAPr2VI9L2BgV+ IqSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TByR5ou9H4c0OYKGXvNNbjYTl32Va4BokotCm+HNExI=; b=BygH7bmYLtBvnJ57eyeCf9hfap7vMFXs3IAdmetmtie7ev/JivJTwlu5q3YE7bGkYX ZDPLVbjoGMOsH7aOGig/a4sMNLPBYZKNvi/d1IirG3bf0Ax2Zv/WyAduhFqKV0WS/oBi Wm3O4DRoIL1rgqk6Gg4Bd5d1BKZ+sCMP9lX+dWXMKlrOCkB0Vo+QEjLkBJqkBYxuwjsV siG4Y40QTyKsXUxVoYfbvOo7iYmUIHmTf7MAUHSK7HNPPFqwm4pSNyJZ8wMU0OaIoLxS bhYJInMvYe/5Fas7n04WVgu/n581RCEKXF0pmGGu5z4nCnctq4eT+UmoMCBQk2yw941B i6mw== X-Gm-Message-State: AOAM530kRXYmXkLb6qlHrrzsSq5VaaEZ1AX3mfKwQvpdgio6wvOaPtC6 UE4WyHLdZn6J85bLxOcIsnxRjPEre1M3RQ== X-Google-Smtp-Source: ABdhPJy862mRYOIQeyDpLrahUqyKmhDegCagR7pYVWBXjVKwECSnMzyhIwKgILMAgmGwcQdirfde7g== X-Received: by 2002:a9d:781:: with SMTP id 1mr8005188oto.350.1603595652775; Sat, 24 Oct 2020 20:14:12 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id y10sm1659665oot.46.2020.10.24.20.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:12 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 18/29] completion: zsh: simplify nl_append Date: Sat, 24 Oct 2020 22:13:32 -0500 Message-Id: <20201025031343.346913-19-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's exactly the same as __gitcomp_nl(), no need to duplicate code. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index f0babc784a..85365bd2f7 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -112,10 +112,7 @@ __gitcomp_nl () __gitcomp_nl_append () { - emulate -L zsh - - compset -P '*[=:]' - compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0 + __gitcomp_nl "$@" } __gitcomp_file_direct () From patchwork Sun Oct 25 03:13:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855121 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43A31C2D0A3 for ; Sun, 25 Oct 2020 03:14:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F34D520936 for ; Sun, 25 Oct 2020 03:14:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HtQvV0Zt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766875AbgJYDOT (ORCPT ); Sat, 24 Oct 2020 23:14:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766862AbgJYDOP (ORCPT ); Sat, 24 Oct 2020 23:14:15 -0400 Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0562FC0613D2 for ; Sat, 24 Oct 2020 20:14:15 -0700 (PDT) Received: by mail-oi1-x241.google.com with SMTP id k65so6392485oih.8 for ; Sat, 24 Oct 2020 20:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l+SRCfB33G0oz+QQo6beD7LqhaEH7L3JtvHO/S6OsbM=; b=HtQvV0ZtyHXquCm8uZrQ8Nqyvcrv/lD7sOVoHMpnfmCM/x89+U0EQZ04RE1QG48zSn GbbNkEKc80FWzZtpnE6SEaNwvDvcxgVGFfOGTSlHyKIbt/07J7UeszA9oyG8fx24jM1B 3JIJsGBtpS+lqsbDCpOlfd268YYp2nOU/KIruCqQLqKW3vRQvBh+4fY9FAbqnRsqMhyQ kRpR9pmjgulI45FHX+1Z++V3yN/8Hbtw//O4lVen2acyEGHsZhlmgKYJ+E10AztUDYOb CViuXOU/nyqIVGen2GzFmHejyaCqlK2k4OOlUDg/szzqs6HgFmG2v58nYsxha3U3ImwS 392g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l+SRCfB33G0oz+QQo6beD7LqhaEH7L3JtvHO/S6OsbM=; b=FevPuWveR7sFrindl0aSl0rmvGlNWkT+a+r2dI6HQSKTebA9Wgge69PI0kmxoQaLkw q7ijTBY9YJ927AAFTmb4TPTpPwQtEPG/kZa0dDx2DNVI8LwFTuaP0lU9KxwDXAQLHM8u bC9DhxQgpehTpmF0ESQewYh0x+FDET1ftSflpb8sMoEOLuRBEYmvB8mpDWYXIsJin9iV 1YrwFlPQtoAfHxjaShqjuizSJhLFdDLsC01kz8ZeeoX9xlq9kMZN0pDMOj9H44ebhtUR NNsnmbiWVNYq/S0hFtfyptUtDftBbltDTC8bwDJcQJ3Io8S0UCOIXhd8jljcZA0ybnni kk7w== X-Gm-Message-State: AOAM531PdWJcK996vfNy1O77Qyftar1g9k8EjgSLQDyIdaK+6rihdW4/ r7iR513VQVhIqL6Ky3gNWAJG73dVrsSpHg== X-Google-Smtp-Source: ABdhPJz+Z9rYp0vcIz4ToudC39YkpxivQKw7N7H7PzH74U/q56FK5NYol5vM0RRjb7+pCmkBHRTo/A== X-Received: by 2002:aca:5d07:: with SMTP id r7mr6415621oib.87.1603595654233; Sat, 24 Oct 2020 20:14:14 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id q22sm505962ood.32.2020.10.24.20.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:13 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 19/29] completion: zsh: simplify file_direct Date: Sat, 24 Oct 2020 22:13:33 -0500 Message-Id: <20201025031343.346913-20-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's exactly the same as __gitcomp_file() with no prefix. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 85365bd2f7..aa484ad9ba 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -117,9 +117,7 @@ __gitcomp_nl_append () __gitcomp_file_direct () { - emulate -L zsh - - compadd -f -- ${(f)1} && _ret=0 + __gitcomp_file "$1" '' } __gitcomp_file () From patchwork Sun Oct 25 03:13:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 895E3C2D0A3 for ; Sun, 25 Oct 2020 03:14:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5147B20936 for ; Sun, 25 Oct 2020 03:14:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cvbIHwTk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766879AbgJYDOV (ORCPT ); Sat, 24 Oct 2020 23:14:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766865AbgJYDOR (ORCPT ); Sat, 24 Oct 2020 23:14:17 -0400 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4560C0613D0 for ; Sat, 24 Oct 2020 20:14:16 -0700 (PDT) Received: by mail-ot1-x342.google.com with SMTP id o14so5097257otj.6 for ; Sat, 24 Oct 2020 20:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nmtxj5x0IQy+8iccE7nuiRsvHXQ7wXOYYCu0JAhS/MY=; b=cvbIHwTkwPaVtOsAMV9pnuAZE2J5wnAw/NfpdnqEDB8qPrJqSDc2CKSQay8yGnl9y1 c6+QmFRPPWUGkIfDPFEebDL9eK51OQb/19hCnEHwb2DEqDIUak6nt5Jh73AFLA4Z1pvF IwvstGZzi71fcnwUd8sdIz1GNAO5LVKzKsxM62zIjfmUxU5dh4BlMgBRgId4zkW8gLuY 2BY5HlbATW1dBSSC6XlQwGctyDoWwCadJjOn2k4QaWaVYYjrpmHbApvNIgR3j+wiBgXh /AhbX5YOSf9fRjcNC7XiLFOA/gmNzXXZBs0EYrWg7cgqvddCOC6U6HAERLRp3DlRVfNH ns9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nmtxj5x0IQy+8iccE7nuiRsvHXQ7wXOYYCu0JAhS/MY=; b=WLYubhKmsZR4Ug6c4tMZ7pIu772d99cgTvjh38oY1BFlrUvEDiU+Gh+zPvYzk/vyMZ K0VPILArHGnGG2hXxk3V73D3CQw9wm9l3COB/NRWXRl53LzLlb/QdItm7ZxfG5bjVpx+ IgX/cqHHvpM5hxjkiT9fvbxvHZUpT0D1nWnf9jkO49XKfEflMPrdedQm8egsr9O1hvXv 0oWFGuRPiwcLUiEBEm+HvJGlMdBEDn5EUOlsjAgYzO0L2iu9xbEdVs4lLkc9+nE3BQss 1PrXjPN6z/Mll+DDA93P7yiPVmm2Dgy/qu+3KtK7DFKIYjwhVhIxacuVfUfK5+T2v7Vl DxJQ== X-Gm-Message-State: AOAM533HvDWmFba3Q9iJxO+Tg8ZLU2viNEd/xDojfjC1oAHsOiKTDfr9 LiND3n07IQ7mjk13kBDuuRi/+ZJ3KbEcDQ== X-Google-Smtp-Source: ABdhPJxs/p8Z92aIQkaMQrKVM1Vf2FDmn0LhBnMqOpbLQR15wTkpaCeT441tU37MT6uaAb8WGVke6g== X-Received: by 2002:a9d:6758:: with SMTP id w24mr2208229otm.73.1603595655732; Sat, 24 Oct 2020 20:14:15 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id s186sm719987oih.34.2020.10.24.20.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:15 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 20/29] completion: zsh: shuffle functions around Date: Sat, 24 Oct 2020 22:13:34 -0500 Message-Id: <20201025031343.346913-21-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Just to have a nice order. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index aa484ad9ba..179e8ff07d 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -97,11 +97,6 @@ __gitcomp_direct () compadd -Q -S '' -- ${(f)1} && _ret=0 } -__gitcomp_direct_append () -{ - __gitcomp_direct "$@" -} - __gitcomp_nl () { emulate -L zsh @@ -110,21 +105,26 @@ __gitcomp_nl () compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0 } -__gitcomp_nl_append () +__gitcomp_file () { - __gitcomp_nl "$@" + emulate -L zsh + + compadd -f -p "${2-}" -- ${(f)1} && _ret=0 } -__gitcomp_file_direct () +__gitcomp_direct_append () { - __gitcomp_file "$1" '' + __gitcomp_direct "$@" } -__gitcomp_file () +__gitcomp_nl_append () { - emulate -L zsh + __gitcomp_nl "$@" +} - compadd -f -p "${2-}" -- ${(f)1} && _ret=0 +__gitcomp_file_direct () +{ + __gitcomp_file "$1" "" } __git_zsh_bash_func () From patchwork Sun Oct 25 03:13:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2D4DC2D0A3 for ; Sun, 25 Oct 2020 03:14:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A70B420936 for ; Sun, 25 Oct 2020 03:14:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BLKM6JNH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766893AbgJYDO2 (ORCPT ); Sat, 24 Oct 2020 23:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766872AbgJYDOS (ORCPT ); Sat, 24 Oct 2020 23:14:18 -0400 Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E709DC0613D5 for ; Sat, 24 Oct 2020 20:14:17 -0700 (PDT) Received: by mail-oi1-x241.google.com with SMTP id u127so6939504oib.6 for ; Sat, 24 Oct 2020 20:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2UJ3X5+N4ZAQHv8HkKkNMFYEh3PzoPfsOWhG1pBM9E4=; b=BLKM6JNHjSOeds9vy+7Eo7uoHowrHKJEAXfUMvD/GcbAdeiJwgeVCCjKaQ1IPAYdkE 48Y2MjkyNsBTN8vaK4pPcBZuQuuiv53/h8dO8kIW6ol6/m2jMxdhSeot1H8tVfy4G5eu pI8GRys8F8XSBr4oJI56LnzxPjGiZiw0x1iPU5ec5+ah0EdsrZn7wPWKVf5wajT6r6f9 ZU7gw2IF7BkzLYTDYpQGaT5AB4gP4p8+G60ddKud/lJGaO0dEcs0JlKMsyGTWOlvugJT DGEtMaP5OiupeqdAhhhb+FRFH/jchGUMTgIYRH0mRQ7o8MpH7Z5diEU29VEr8bv9PxoF DKhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2UJ3X5+N4ZAQHv8HkKkNMFYEh3PzoPfsOWhG1pBM9E4=; b=uPO/H6bgr/+PN/dewhgzQ0BFbhltdts44EBBHiAgKP/b+SI+Nrd1FL+gJwL+bxrZfj M1e7Qf49HrKFCPXutXG8zBBi47owcxZYBvODSBasKcSxJy196B99hr/KnVmU5kfxfZVm Q5tKeYGSw3rbCvyciDB4pb2eVMsE37oQMDijMmcbWBOcip7wO/aE7pZQn5SrSujKFw1D BWbfbOszeePwLf3hTVkqlGPUPlIv1tDNKklMtlO+XfJ6fW6oHym4uVCZLQgfSxD6dTe8 UA0LOerKcD548P/vw9uNRrLLaYFJK43lGtQ3POGOkoMWPzDgRXqahj/EySW5rVZaZ3gu 4KYg== X-Gm-Message-State: AOAM531JZUiErFhqSbqzB2GARGeKu6astTEQl+MhfZ2kAL7wOI65C0Ep mL6P1AKeo/KMHb4yhgKUDnuP6Lss6+7C8A== X-Google-Smtp-Source: ABdhPJwd02WDoVYjWYFTsL2uvMH+kCL+H7qhVFNrjbx311TMzHVkDxzXuGNhTtGV22vVJ9DniYnqzg== X-Received: by 2002:aca:5f46:: with SMTP id t67mr6467207oib.156.1603595657195; Sat, 24 Oct 2020 20:14:17 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id h7sm1585595ool.34.2020.10.24.20.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:16 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 21/29] completion: zsh: refactor command completion Date: Sat, 24 Oct 2020 22:13:35 -0500 Message-Id: <20201025031343.346913-22-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 179e8ff07d..702ce8db25 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -127,20 +127,32 @@ __gitcomp_file_direct () __gitcomp_file "$1" "" } +__git_complete_command () +{ + emulate -L zsh + + local command="$1" + local completion_func="_git_${command//-/_}" + if (( $+functions[$completion_func] )); then + emulate ksh -c $completion_func + return 0 + else + return 1 + fi +} + __git_zsh_bash_func () { emulate -L ksh local command=$1 - local completion_func="_git_${command//-/_}" - declare -f $completion_func >/dev/null && $completion_func && return + __git_complete_command "$command" && return local expansion=$(__git_aliased_command "$command") if [ -n "$expansion" ]; then words[1]=$expansion - completion_func="_git_${expansion//-/_}" - declare -f $completion_func >/dev/null && $completion_func + __git_complete_command "$expansion" fi } From patchwork Sun Oct 25 03:13:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855127 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA46FC2D0A3 for ; Sun, 25 Oct 2020 03:14:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B57CD20936 for ; Sun, 25 Oct 2020 03:14:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f7bDOO5R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766888AbgJYDO0 (ORCPT ); Sat, 24 Oct 2020 23:14:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766862AbgJYDOT (ORCPT ); Sat, 24 Oct 2020 23:14:19 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5849AC0613D6 for ; Sat, 24 Oct 2020 20:14:19 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id o14so5097289otj.6 for ; Sat, 24 Oct 2020 20:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5ZO8XtpxlyUrQgt59tHFPcS5frvIGuFbj4NiNC7to1U=; b=f7bDOO5RIaVm0s5lqogjXHNH5EGZ/ph4dqwMFepiyF8++MZ5eWkdyoRej+nDEQVx3y uyTLXvoMZiu6ZUXn07a89WzwIui/y0YY+9O3VqAI1ovD9gMuZ6QitYY5mWHtbacVLC8q B4BUNn+yzT8G4ZQg1XlAFEUZe3hmwLsfxk8MxRh6Q5eKsriKp02bHv9cWPQTRlbCf30S +ShB560wfGigLn/EkMvOlN7axXNZdtpjFu8Caf3Ow8PTCr+fd0Em1lEIzOVIGnfxBcIq SLe2QGMzJaQtQ148IN4LJ7yxXjLMCsr+tysGDdliuiGlDJ1KfqFWpgh+iaRVcdL/bmQm tBLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5ZO8XtpxlyUrQgt59tHFPcS5frvIGuFbj4NiNC7to1U=; b=nhAjfac6PtunNThcZBhmnCSC9YhkS2thMqkT8NAR5gXUxIQ9cueSIDSTBy4wPgeYMS vjS/fU3uMLhEsYlzVlZVr33G8QXvnRjCstGr/ap8hN98vdvoo2HGgMGWTpq9yzjvvWdz yi25cMsPlqQIWRJnBarRfFhmidA/TlTKno1WTH4UC4S2uo1l58dKhWSh7W7vksWFEZWw i5Gch2U6FuidiaExSPon2mJ2rZZkCz5MIV2A6+ldlq2PBgRuPQsTPwsd1hXXt9a2TrJO O27lX4aBC6Bz+dctY4VqlRe8cCuMQ/nqqbSyFgeWFJ3wF4ZIvyaDhHNH04DAYuMYnMoG dzZA== X-Gm-Message-State: AOAM532C6qcRJt4pqK1MfMFy0VPpban0aa3nmxkLLcIF4o1VUfUrbzbh g9DJPUbQRNhntDTRiZI+CXPuakOO6DUkuw== X-Google-Smtp-Source: ABdhPJw2MEoNMsWx1hbQhtkIREZV4TgKLvE8kAFjeJdjGhTX+nQZQ36RCpsC8ZIfJcHvP6hebkDneQ== X-Received: by 2002:a9d:32e:: with SMTP id 43mr8677422otv.144.1603595658553; Sat, 24 Oct 2020 20:14:18 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id b7sm1840451oic.36.2020.10.24.20.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:18 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 22/29] completion: zsh: improve command tags Date: Sat, 24 Oct 2020 22:13:36 -0500 Message-Id: <20201025031343.346913-23-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's no need to use _alternative and repeat a lot of the code. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 702ce8db25..2016e8c1b7 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -228,10 +228,13 @@ __git_zsh_main () case $state in (command) - _alternative \ - 'alias-commands:alias:__git_zsh_cmd_alias' \ - 'common-commands:common:__git_zsh_cmd_common' \ - 'all-commands:all:__git_zsh_cmd_all' && _ret=0 + _tags common-commands alias-commands all-commands + while _tags; do + _requested common-commands && __git_zsh_cmd_common + _requested alias-commands && __git_zsh_cmd_alias + _requested all-commands && __git_zsh_cmd_all + let _ret || break + done ;; (arg) local command="${words[1]}" __git_dir From patchwork Sun Oct 25 03:13:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A8E6C4363A for ; Sun, 25 Oct 2020 03:14:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEEC320936 for ; Sun, 25 Oct 2020 03:14:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZzfPVZSe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766899AbgJYDOd (ORCPT ); Sat, 24 Oct 2020 23:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766885AbgJYDOZ (ORCPT ); Sat, 24 Oct 2020 23:14:25 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06172C0613D2 for ; Sat, 24 Oct 2020 20:14:21 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id f97so5112726otb.7 for ; Sat, 24 Oct 2020 20:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SVig8LGObvIw1oRjICDoKkMEQS+1YfW803Mwgz++GCg=; b=ZzfPVZSeOE9Ub5qR4Ei1+I14itnXyTuoxtZgkWi0ldBNixBxSIOtWeVuWBJzAv+lzn qNnmCksYYUqx4BstiilfqxrCQvBHiWzKIMFElEYd3MJFpCR/3xKAut8hOSSDIne9sHGG Z3HHl4LbngRFJSVtU5UoFaKBv+8ETKkwXtYgmmRd5lAF7OZLeFNMl2r9XZ84Zl2JGzH8 zHWoOuIrgt0aVRqPkLWvmG64GMrmn9R1aQrVpXjbotAtxoCBJRdK6CHgcrJUA7VdM3Q3 5LepmplZ91qncTj5lqStVZXVbZheCSLs4isMQFDvbWxSBQ/hhnwGi/pcQ1IflRz5f9P4 1hRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SVig8LGObvIw1oRjICDoKkMEQS+1YfW803Mwgz++GCg=; b=QTvoI+d3oFf1y76mn0C4Ag5LAy6U0mnmT6cIwpeiJxv/+4KYmOhHdG1TG2yWV/sSka O6eyefmqiTwTiC/6hidxqSBeDX/GqvwyEq3tub7C1Mq5nG0bm0v7ZUhMNNbSCuw5Iv6/ qU3ELKdjvK7rTOaHvQshh6qWDSA94i7DqbttipAt01BFhVp5/k5g/faBUfRxqSV1utCH Nbt+xZNWqWF0jSljNYyY9zlW5+h5mdI5+QYUqh92JALfIWHS6vbA2yVGLuHN/A1Yr2LQ 7yOL06Jbw1/VHgCBWoslzBllPdg0hslNEgcIzQ1lFbCItWfe3otQonJKfPwalwdEUNJX KnUg== X-Gm-Message-State: AOAM530kk0QG5qHqrl2xsETUvPRbsS1wVPR2KgSvQ+4XIvUwHQrF/7Fl bRutNnDkt4G0T2mxUtYE6lifUyib46+X0A== X-Google-Smtp-Source: ABdhPJytUz6E8z6bHZoCih3cbYboU36CgJ8AeujVYNFV+WAlFmxtueDmbyjYWbB2mq+DWBC8+p05wQ== X-Received: by 2002:a05:6830:2389:: with SMTP id l9mr8709078ots.316.1603595660171; Sat, 24 Oct 2020 20:14:20 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id d3sm1585510otb.24.2020.10.24.20.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:19 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 23/29] completion: zsh: add alias descriptions Date: Sat, 24 Oct 2020 22:13:37 -0500 Message-Id: <20201025031343.346913-24-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 2016e8c1b7..d90eb6863b 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -189,8 +189,9 @@ __git_zsh_cmd_common () __git_zsh_cmd_alias () { local -a list - list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*}) - _describe -t alias-commands 'aliases' list $* && _ret=0 + list=(${${(0)"$(git config -z --get-regexp '^alias\.*')"}#alias.}) + list=(${(f)"$(printf "%s:alias for '%s'\n" ${(f@)list})"}) + _describe -t alias-commands 'aliases' list && _ret=0 } __git_zsh_cmd_all () From patchwork Sun Oct 25 03:13:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9938DC4363A for ; Sun, 25 Oct 2020 03:14:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B4E220936 for ; Sun, 25 Oct 2020 03:14:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k9uuuVmc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766884AbgJYDOY (ORCPT ); Sat, 24 Oct 2020 23:14:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766880AbgJYDOW (ORCPT ); Sat, 24 Oct 2020 23:14:22 -0400 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F916C0613D7 for ; Sat, 24 Oct 2020 20:14:22 -0700 (PDT) Received: by mail-oi1-x243.google.com with SMTP id f7so6958098oib.4 for ; Sat, 24 Oct 2020 20:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ivPVDZshxEmKG8T2X7nY7SDCvKqPSnHv2R5zyEqBPQs=; b=k9uuuVmcKed6BC1GKQTKCpYBdqL6Cdg96Q7EugEheHOONpeDiEkPR36tvxKU4nA1A1 iANg9/pSphMPNlg5pYROHQV2/XqDIa9p7ul2yUL1/UR9VWOVYdikuB//3f1IpGRx8rwl EOG336ku9DqE5S/Vs/ox/QJQQ+Hk0UMj6E7Z9QluZXsvYcMMD87avWM5rT2iIclY011p 2zxQeQNZFovH9V/F7wbi3dHOGv0mkQ/r8dyuFB8l3lzGMK3XiUYENUaCU4koC9iFTzaa a5NcLWFvij2Ge9sbKfzBjdRamJ68AziuRve4/DWwkR0eFMCpljFbBsrIFoibkN39drrZ ublQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ivPVDZshxEmKG8T2X7nY7SDCvKqPSnHv2R5zyEqBPQs=; b=AkpAiPOW4lYWOcRtniSE6gi5DIAdlMjdpoJZry7shNGPJN/AOAmgBUVSvAH2yKxkQm yOAriS7GdDgFQuK6p/DItLbmoHtPlo4oZP8vPOg3d32qfq+MJVnCepBIPsvLm/5HZcx/ yvFJuanLYAHrv6qB7yjLDK6pTCJf++Xiq+mr9twa5Yvn5hmscyshPfV27+rAspkYTWpW MWoWiM7rux87ScvU0sI7dHL7LTtDhgOCeGi0r1NEoEJkdTyZYnw3rayHUGZx7nS+y9aJ CQbfzavj6Yhi8FsjIp3tPoeTEmjZasFIMDsHjaMq3Ov33dQfBPpfbsUB5tRiXguaknpP AxLQ== X-Gm-Message-State: AOAM532utKRXqed2RW0wC9z9tIY56NFfPmwwxfNKyrRvH/KYht7Mi/CQ QxUYePtTQlIE1CUSifogAtM5F4ajGbtoNw== X-Google-Smtp-Source: ABdhPJxdnKInieZMFG3MtHi9EpqNMG66BCxQa/5TVFcS4Jn4iFoYHKfvblOoLuB7q7c9wE3OPQ1Wzw== X-Received: by 2002:aca:cfce:: with SMTP id f197mr8215622oig.44.1603595661762; Sat, 24 Oct 2020 20:14:21 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id h6sm1889887oia.51.2020.10.24.20.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:21 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 24/29] completion: zsh: trivial simplification Date: Sat, 24 Oct 2020 22:13:38 -0500 Message-Id: <20201025031343.346913-25-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From upstream bash simplification: d9ee1e0617 (completion: simplify inner 'case' pattern in __gitcomp()) Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index d90eb6863b..1b2a43150d 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -78,7 +78,7 @@ __gitcomp () fi c="$c${4-}" case $c in - --*=*|*.) ;; + --*=|*.) ;; *) c="$c " ;; esac array+=("$c") From patchwork Sun Oct 25 03:13:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1189C55179 for ; Sun, 25 Oct 2020 03:14:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C058B20936 for ; Sun, 25 Oct 2020 03:14:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tNmfgz2Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766897AbgJYDOb (ORCPT ); Sat, 24 Oct 2020 23:14:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766882AbgJYDOY (ORCPT ); Sat, 24 Oct 2020 23:14:24 -0400 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ED47C0613CE for ; Sat, 24 Oct 2020 20:14:24 -0700 (PDT) Received: by mail-ot1-x335.google.com with SMTP id f97so5112781otb.7 for ; Sat, 24 Oct 2020 20:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GXyycjBspfmxshLrLUjsVAwiWf4gb9tWqshbWGRQKZQ=; b=tNmfgz2QBpugzRd6jHtpR5pfIBKe6Ct9ucS7qc/BnFztihogtNL3Lvmiuat9m8WcwG 09XRE0AtHmqe3VTEb29qKwPSbCqA5S80hspwVgw7W80uiSj+j+R0I/+4n9aY8qqg8oNe qDOu+lOnuU7Ayh7+2wZE9ctRnvGl7rMVSIOR97maBLxMdkj4RbiZspO8uG4qFW8P528m Y8fe5brwNTMCuydh00AqkcyUty989QqMvI8eQ+YU/FxHs9BvwGRm2jHpcE+fTLRUBYE/ RmbGzsjH7OQWJFNqEjcK7k8ep6HJMAhjAsZV7GnfDiWbcjDNXofjZG4bS7KBMMj/HnAy ELSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GXyycjBspfmxshLrLUjsVAwiWf4gb9tWqshbWGRQKZQ=; b=H/7HADl5AYo+UMF7NeFEvZy/ozADHFXU6ibhhlFzAfoDzako/0NIyf1keZouHeDa9V ZG/3nkwP4/JmxAVQOmkzorRpW55MSLrq73XIFnz3Nhs5/JTbITc7kYs0aw6QecNMJAr2 Xpwi1S7O7w6WgV0u2PUzY08L4fdvHn+q7DzyG5A2gcUVyBP2tfEGW6wPKX186h8DSAlN x704e7aWUg7rlJbIBS351+yiTgbK7YIkqLPiFWwKJBa+mbEI1jzNWna+DlCdhTqGjOrD W96ELYrzVMan4qO4BmMRrpE/W2yx6Nh4BqM30qMufCsFkaIaSSPZYiPYtD1aSzRm4INf HwqQ== X-Gm-Message-State: AOAM532TUa0F277WVqiYP4GmwJ0ryZTANCDbgzGob+5UXyG1DoSeWQm5 2sexhUACI1gEzzxE4N9RQRhmSfFD1VoXEg== X-Google-Smtp-Source: ABdhPJypLw2OYa+Fs44oV6043VNVIY4lR3iXJisVi9VaFojrQ5whCLwZlVGcjPbaMg1rLaUdLWPmEg== X-Received: by 2002:a9d:10c:: with SMTP id 12mr1869152otu.95.1603595663440; Sat, 24 Oct 2020 20:14:23 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id s186sm720059oih.34.2020.10.24.20.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:22 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 25/29] completion: zsh: add simple version check Date: Sat, 24 Oct 2020 22:13:39 -0500 Message-Id: <20201025031343.346913-26-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A lot of people are confused about which completion script they are using; Zsh's Git script, or Git's Zsh script. Add a simple helper so they can type 'git zsh' and find out if they are running the correct one: this. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 1b2a43150d..9fc9f2db21 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -127,6 +127,11 @@ __gitcomp_file_direct () __gitcomp_file "$1" "" } +_git_zsh () +{ + __gitcomp "v1.0" +} + __git_complete_command () { emulate -L zsh From patchwork Sun Oct 25 03:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E326C2D0A3 for ; Sun, 25 Oct 2020 03:14:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2852520936 for ; Sun, 25 Oct 2020 03:14:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="u25puNMv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766905AbgJYDOk (ORCPT ); Sat, 24 Oct 2020 23:14:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766886AbgJYDOZ (ORCPT ); Sat, 24 Oct 2020 23:14:25 -0400 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B951C0613CE for ; Sat, 24 Oct 2020 20:14:25 -0700 (PDT) Received: by mail-ot1-x342.google.com with SMTP id x7so888270ota.0 for ; Sat, 24 Oct 2020 20:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SbBxvfoln6EKFeCnDCIvuxliBbQaB/eJv+xTK9cJb3E=; b=u25puNMvFsLIq2Y0V+YOillI8U+FqzNGVkFoXBpSWRrKpRI88z7JjmdILjwzF8i/Ty zj+FFUcbuYhk24vGuOKV8ygtYFTFqKmtDQ94Y6wbkuYf2w+6tv5sdG9VUGRaPMrYtI3+ g0sJ1x5Gxh9UkLauQeXK8MaUdY1wctdlYf8HnxrqNlkXUuqwkAcfLg1WCfRGATX6E8IZ oM12lWstjfGzbESkeEsj/wmtX+dVLta3HpwXXOfPX8E/y+5nVqB3wJLwClXC8to/ND0X FI9Kqa0ShxRBmt5sMpVtBMUAfPuot6qvfZ1iMECnSg2REsSRQ3c6LxCxJO+uj4VHvwvi P/5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SbBxvfoln6EKFeCnDCIvuxliBbQaB/eJv+xTK9cJb3E=; b=oN4J++aqMdjxm4mvgBMPr2iAim1sIOW8Q+KF5mxxEnlXrCJKnkmPvhxXoJJXY3/Chm h/GKQcgoe24q1Zv/yhhzcHVcN2xqcuIwOCd+j6MDplIS/G0RwRwjZlAMzyeaGYQGJkc+ KEDLuETKtC+boBDXA726lwHBhEOYtkZbfZMpiD3WS5AXx7kkBXKOOkl18rfu4dSj6QCi V1k31DpSI/P5y+GGPMoanFoXmSQHQgFbn7RhWPvw1+6Pp2t6o/VcgsqIOS1TBEVCITzT /4VPJmiSx3B8GDQbyPx4dlGkQPA3DfgSBXCITYQq9GgOedpYDlcEqvSb8i4jwik4Of1j tgpw== X-Gm-Message-State: AOAM533Bvt76IY/c/g6nMZlavvCb1zdcOBaZOINmo+6R3Z6EKZlct0kI 1PuGnvyiQJxVe1ETPNWOt4QTrfcZ6TeDXg== X-Google-Smtp-Source: ABdhPJzfdwC7qkCJfvzIrLb34YUCuq2IZVwDDR4Zu0OUxeKePDzEOmYeiJItO1Xx84NZyY03RgN3Bw== X-Received: by 2002:a05:6830:3141:: with SMTP id c1mr6587363ots.212.1603595664782; Sat, 24 Oct 2020 20:14:24 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id k15sm674306oor.11.2020.10.24.20.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:24 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 26/29] completion: bash: trivial cleanup Date: Sat, 24 Oct 2020 22:13:40 -0500 Message-Id: <20201025031343.346913-27-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's no need to set a variable we are not going to use. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6de0e7b482..68e0acb232 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -416,14 +416,13 @@ __gitcomp_builtin () local options eval "options=\${$var-}" - local completion_helper - if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then - completion_helper="--git-completion-helper-all" - else - completion_helper="--git-completion-helper" - fi - if [ -z "$options" ]; then + local completion_helper + if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then + completion_helper="--git-completion-helper-all" + else + completion_helper="--git-completion-helper" + fi # leading and trailing spaces are significant to make # option removal work correctly. options=" $incl $(__git ${cmd/_/ } $completion_helper) " || return From patchwork Sun Oct 25 03:13:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0CD0C2D0A3 for ; Sun, 25 Oct 2020 03:14:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9066020936 for ; Sun, 25 Oct 2020 03:14:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XqRXPLHR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766901AbgJYDOf (ORCPT ); Sat, 24 Oct 2020 23:14:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766890AbgJYDO1 (ORCPT ); Sat, 24 Oct 2020 23:14:27 -0400 Received: from mail-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C7DCC0613CE for ; Sat, 24 Oct 2020 20:14:27 -0700 (PDT) Received: by mail-ot1-x341.google.com with SMTP id n15so5085826otl.8 for ; Sat, 24 Oct 2020 20:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VrkicLVmMPDV7C0agD08QEXLiVvggzyoG//El5+14bw=; b=XqRXPLHRg9D0ZsS8/TsB9Ocn9DrgvTa4sMc2sw2ryX0jP2fFbn48mvMoXgqPtheIBN u0T8At6IEIke+M9xSK5K9tyqfNzmVnU3Rr+bwvOQG4sBVmIQIX1xCi1d6VyaWusV1Keq s5tOW/7WeJX25TXOZ87X+nP4dzNCT2M9SlHZNroRqp3PyoxNnriV8Z18ZpH9gPDRld36 H3u9UB0r8s5k0cxjhudF93Rp7rsQ4dzCrBy44K7Vs7xZi2XbL1wi/DCD3ZEBfAzrJcDq UHUX86QwCZ0SO3ISEYiW+phxpuX+VH6wk9wsCFeotSS/dvgWpk29L7mImsTHnu5yPhEJ b61g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VrkicLVmMPDV7C0agD08QEXLiVvggzyoG//El5+14bw=; b=LFwZcVUDtu1S1wqK+mQMhXoBe8A3VlxqDo2E9j/PNX97Eakvel1QFF4bflakk6OXO9 XoxpW9qk3IE52YOPpgdj908nyHJTs4H5+SxoX1ltV3k874/J1eGIaCg93iwP2ggScLSq RyIw8rlX4069OlS9JtiONyJM/8rEmSXLOCfC6M4z5nd6/tqbWQRUJGSRKgNY5vJeqBqz QmgrOymX9KH689u8VEgG9K7crMFjKXQcxAsbBdi42l7FaL5ukMfgz9o1QURqllIuIwmF 260ESur4qR2XwtxYD96Prvy/t0V4+mqdTu7XHMRhnI8Ng5Rni3bRvUI04ZD6iDtu1Rrd fC9Q== X-Gm-Message-State: AOAM531wqVV3kxb1enj0UQvIvdu91IySjStESJn8EBdHfxvnH0QS6fAv bLfP21t1caqbieNog/WWLg6+Lq51JbwQow== X-Google-Smtp-Source: ABdhPJyzKNKHPi8N1rHQivAO7sALcOp3oBOGR18mNROeHzHUrItB/I/NoAkMecastd9BPaKhXk7AsA== X-Received: by 2002:a9d:6b09:: with SMTP id g9mr6890217otp.202.1603595666417; Sat, 24 Oct 2020 20:14:26 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id w16sm1679086oth.8.2020.10.24.20.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:25 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 27/29] completion: bash: cleanup cygwin check Date: Sat, 24 Oct 2020 22:13:41 -0500 Message-Id: <20201025031343.346913-28-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Avoid Yoda conditions, and use $OSTYPE. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 68e0acb232..ac1835cb30 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3500,6 +3500,6 @@ __git_complete gitk __gitk_main # when the user has tab-completed the executable name and consequently # included the '.exe' suffix. # -if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then -__git_complete git.exe __git_main +if [ "$OSTYPE" = cygwin ]; then + __git_complete git.exe __git_main fi From patchwork Sun Oct 25 03:13:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2307C2D0A3 for ; Sun, 25 Oct 2020 03:14:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1F6D20882 for ; Sun, 25 Oct 2020 03:14:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GhgeFGNY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766903AbgJYDOh (ORCPT ); Sat, 24 Oct 2020 23:14:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766894AbgJYDO2 (ORCPT ); Sat, 24 Oct 2020 23:14:28 -0400 Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D31C5C0613CE for ; Sat, 24 Oct 2020 20:14:28 -0700 (PDT) Received: by mail-ot1-x343.google.com with SMTP id f97so5112851otb.7 for ; Sat, 24 Oct 2020 20:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=22T4sezOB3BBGn6leesAspm6GOVpoasFpsJBodRhGOM=; b=GhgeFGNYa12GmkRBeWXXcXXwr8hcDLDesygu5hLOkRn+rO9iWQd6fvk0SFy+gEyBpQ 86PYUf/L6sOZ2WV9XYBPSeP0TD1amJN+ZGF7562wCIP68/ZldVFd4CmbAemSe8llKTVZ E87Ah6CAHyDkwr80J1kqrgGvdA/Wtv/Qg5uSDkeWQg/Yg+7GTQBvw16Zb/GDM5lkMZXa ptv0hWZCEZ3dAJTmF1eB4c6GPRsX0OrUxS9JTGBIO8rr0LXub0Av5vSwU7Xh7SW/enhs HSFIw1qHEiSUaqq88nHfRFqHdLso8oKLmAYmcBMK3CjqGxfpgC0RlAVmIP/AqCMTP0vc YP6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=22T4sezOB3BBGn6leesAspm6GOVpoasFpsJBodRhGOM=; b=eMPOYbQOMKkFNjg4j3VELgEeF+Mi1Lwkc3p0qJm1r8Rw7+tOSfA7gEzAjmjUSZNmRY nF3ILsztDnjeW4yXleaAWTQjwV6rt2lVbT9TkXahbbWPO9BIiz3KQG/rDv/KOvZhx+Tf 82WnrBLGLecVfZUDjTK12tjz8qMxRrfrJvnwBbVZr6SFr4eY60vKwGCkyvftYPqRSRUd J8XJV/wSbbEeOf9hKyt3ngij2R3aQhZZ4dfwCctgWEzJpM/icDXI7wVBMSGr5fiECMBL sRK5nlRwmN5tiVOCwkvSluVobJWQHbmBqbK26SVTCHadWrdhcF5v7prKu6gFdhz0jKaG z1rA== X-Gm-Message-State: AOAM532L9/mm1FbU1bjpWyO6SsIccFmZKCYNUx1GmNjsEHwzrazKX7Mw goZEgWL+lLoYcIJ+UD0q1q3zGAqKMVO05Q== X-Google-Smtp-Source: ABdhPJzg4yBqyF11RRGQW8bI4JQ1K+pCgQKPTsI3j5U8iLkPaE5P5WphYdICB9orxcFfd84lC0EaZw== X-Received: by 2002:a9d:7419:: with SMTP id n25mr8145004otk.183.1603595668072; Sat, 24 Oct 2020 20:14:28 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id f2sm1676509ots.64.2020.10.24.20.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:27 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 28/29] completion: bash: remove old compat wrappers Date: Sat, 24 Oct 2020 22:13:42 -0500 Message-Id: <20201025031343.346913-29-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's been eight years, more than enough time to move on. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ac1835cb30..26538efb80 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3481,18 +3481,6 @@ __git_complete () || complete -o default -o nospace -F $wrapper $1 } -# wrapper for backwards compatibility -_git () -{ - __git_wrap__git_main -} - -# wrapper for backwards compatibility -_gitk () -{ - __git_wrap__gitk_main -} - __git_complete git __git_main __git_complete gitk __gitk_main From patchwork Sun Oct 25 03:13:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 11855141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7A80C4363A for ; Sun, 25 Oct 2020 03:14:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8498B20936 for ; Sun, 25 Oct 2020 03:14:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cfy05UGK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1766908AbgJYDOm (ORCPT ); Sat, 24 Oct 2020 23:14:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766896AbgJYDOa (ORCPT ); Sat, 24 Oct 2020 23:14:30 -0400 Received: from mail-oo1-xc43.google.com (mail-oo1-xc43.google.com [IPv6:2607:f8b0:4864:20::c43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51131C0613CE for ; Sat, 24 Oct 2020 20:14:30 -0700 (PDT) Received: by mail-oo1-xc43.google.com with SMTP id n2so1549053ooo.8 for ; Sat, 24 Oct 2020 20:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IpYxavsTVxlyOo6i67ilYnK0thPLivsx6u0u0MGtU1Q=; b=cfy05UGKuk55WCkXWqeZ45I2tEBOxwfp7//K0ocxXa/daOPS67FVy4pZPepL3OaL2h isTsyac1UP3xtp7fBqs/aJXjIFvjVfJl7LNlQEB0F669PUPfahwUqwVlcP7kvCAcF04O cFJQdQq5wpygucDYRDhJVwJYwzQ6QMD/fKqp/IqYsT3PY0Q95IGu5hQwmp3glPor+6ys ivETkCkND49t+f91d7KTYfumgpSjNOQiHEKhVBnnbmOOGrbbOCfG1eKcj9ryvYJb4UtU j+IyNJ43K33otCAV5sp2WffZNT+pVJaDQX8v6pCf8B2KAjh84dL1W+C195TtZzzK+J4V 71ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IpYxavsTVxlyOo6i67ilYnK0thPLivsx6u0u0MGtU1Q=; b=d3/n0zQ08SXlNADWERLZk//7ql6otnxSvWXCUwPExGvMrU70E5vdn5zlvXdVJSeSMh iuD97GcA1DcP1EKYF5AvH71rN1ZDJ8r6EbSd8arILu23C5SQ7R4MLzYV02d8CdzbG5Lb 79zVIbIg1Y6ci4Fc7R35F18t+25QXg+0qKuq9gOLjpUgPiykJsHu1fEdeIaupkMzVCli +QE6cmxpfvKb1C2MEF+EhVwjVYjq7SGz7s4Wyj5zDKz8paIZNpxfrDjgpwx8lB9FURzK 2h2Jo0NCMJjG7b6wGUNfOV4MERicdmyiqrI92SjEHHx5YRQcWDhOvQtd1e8By8uQik0d L7VQ== X-Gm-Message-State: AOAM531Ks0GmU1c6rEzhx3rrbnPRhfLYe4xGcW2cxjCTB12llZHlAU34 cY5qGcVqhGCojaz4cDStMddiIMJ0ij0Gyw== X-Google-Smtp-Source: ABdhPJzwnTNxRdqY/k69M0TRQNGHJbSHOBtcEact6BwiRKYqULkbvh8gFIt+iVTQSCZ2EVWUgmbQQw== X-Received: by 2002:a4a:d554:: with SMTP id q20mr3967448oos.23.1603595669536; Sat, 24 Oct 2020 20:14:29 -0700 (PDT) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id q14sm1887392oic.38.2020.10.24.20.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 20:14:29 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Felipe Contreras Subject: [PATCH v2 29/29] Update copyright notices Date: Sat, 24 Oct 2020 22:13:43 -0500 Message-Id: <20201025031343.346913-30-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- t/t9902-completion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 9fc9f2db21..d25f8691ef 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -2,7 +2,7 @@ # zsh completion wrapper for git # -# Copyright (c) 2012-2013 Felipe Contreras +# Copyright (c) 2012-2020 Felipe Contreras # # The recommended way to install this script is to make a copy of it as a # file named '_git' inside any directory in your fpath. diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7b7bc6e4bd..caf4e9101f 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2012 Felipe Contreras +# Copyright (c) 2012-2020 Felipe Contreras # test_description='test bash completion'