From patchwork Mon Jun 12 12:52:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7AC0C7EE25 for ; Mon, 12 Jun 2023 12:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235868AbjFLMxU (ORCPT ); Mon, 12 Jun 2023 08:53:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235679AbjFLMxP (ORCPT ); Mon, 12 Jun 2023 08:53:15 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 790B310F5 for ; Mon, 12 Jun 2023 05:52:58 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f739ec88b2so31417315e9.1 for ; Mon, 12 Jun 2023 05:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574377; x=1689166377; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=kfh2VMkOGYUvE4AgBkzqydrO8d9hs/sP/UEVum3BtSI=; b=M/dVCTs18VyuMdc74gQ72h2bSkBPe7mNgu2ePgt2YSiL1vCyUPRbNcxqFN/0gn9R2N 6Z07u7GXbUeMmZLHsPrJ5IjYYq0+FAyZJyuxNeuIsE0RftnTfSJjjOfBudvHMihE2LJK 8lzGVIaAIK4e6GEXRml3lRM1aG01R1NaVbHUyY3KyPkV692z/0MRWULPl1eNH0bFk1AO 8lv6ea0lRPwfd8Pd5T0Uyii6BphaHLikK04FmgivI2vS3acunmWWam+U50tY3OrodQ7o Cay/2jPFVtvwzAQJtGvOYZvEV0a2WCXq/1cBkAco+7BJKNcAj5KEl3/7hhulpGLMFjvs C6tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574377; x=1689166377; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kfh2VMkOGYUvE4AgBkzqydrO8d9hs/sP/UEVum3BtSI=; b=k0ESglVO33mwhdI7SN9Izo55x0I6ndppFqMoSqTobOutrAXFMuN5yskxPx0iGf7x5U a7xJYjaNgjrMi2cpz2X+pPzdKySw0ICyltrVpnKRKmtyK8dUY9gR4hmIMT661WPwph+V 3DLRnWK1tdqZTKL/CZ2VXzvwTlIXPDzDqzPjH/MD8q+pkEQhkLE9udc2+ua/JQFmGC9r 3DdXx4fJtjEHvBq0MN2EUO0ekA+aN/qyNhlK0joHewugFoXhXJXIS6lLsGEMyD7Gh1/J +nPhq/OLrOMSVXlf2JojJAn9oA0UkiWFQW//T485VmBiuEGfEFSPfSxYrjqSqOf4/MVo ZRyw== X-Gm-Message-State: AC+VfDwZpCdZ15SJZnAqW7W1mdjqr+TntsZ60pf9ASGsZCtx/bdJcr6J 2JkeJOsSL38hYenfexp3xArSZ1I7BD4= X-Google-Smtp-Source: ACHHUZ4F61tfYL92EgrQUiKpNISMnCY4xjBcXX6oa/+GZ5GkRjtjdxtAodiqj/UvE/yRMGmLZUqUsw== X-Received: by 2002:a7b:c397:0:b0:3f6:688:f658 with SMTP id s23-20020a7bc397000000b003f60688f658mr5837620wmj.20.1686574376471; Mon, 12 Jun 2023 05:52:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u9-20020a05600c00c900b003f72468833esm11398799wmm.26.2023.06.12.05.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:52:56 -0700 (PDT) Message-Id: <4edabc7f15c3ad55c911919bec5a406bb48ad0ee.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:29 +0000 Subject: [PATCH v2 01/25] completion: add comments describing __git_diff_* globals Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add descriptive comments for '__git_diff_common_options' and '__git_diff_difftool_options', so that it is clearer when looking at these variables to know in which command's completion they are used. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index dc95c34cc85..90fe292459b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1733,6 +1733,7 @@ __git_color_moved_opts="no default plain blocks zebra dimmed-zebra" __git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change ignore-all-space allow-indentation-change" +# Options for the diff machinery (diff, log, show, stash, range-diff, ...) __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check @@ -1757,6 +1758,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --anchored= " +# Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index --relative --merge-base $__git_diff_common_options" From patchwork Mon Jun 12 12:52:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276464 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDFE3C7EE45 for ; Mon, 12 Jun 2023 12:53:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235728AbjFLMxW (ORCPT ); Mon, 12 Jun 2023 08:53:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232559AbjFLMxP (ORCPT ); Mon, 12 Jun 2023 08:53:15 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E4C110F7 for ; Mon, 12 Jun 2023 05:52:59 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-30fba11b1ceso1528921f8f.1 for ; Mon, 12 Jun 2023 05:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574377; x=1689166377; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=oGhLXXBoQ6UI1vHMOyV7YwVlIGSV+5Rfv8inY3ASxdE=; b=K4rHEZw/UyCV2MYbLK+84cL+nlciA+1dHQs/NVxs0PtHDUBIIW1Y9E2l485ctV5+Xo N/wZCeFQb1dYMpdfZGnSdOGYzUS/K8yh5abBte6ENf0snuD7B6qHAa1Gn3TZOsZkUSoA Tuk3MiaFs9+j4rDJuke8bDzE2q1GmhtfF/PL1yYB1lO4tX5NVZoeWfTTXz2pxrokWIZd 7s9KOUnAVhImYECu9LLGLonQIFlu/6Eeu0MFj0xyThWe82s3UxKj4mPzSuQr424KQlcM WFqpRt+4/viwwvH7H3UhUTckUR8gKTeSR2d7RsrBiiDHcw6TQeZSouMBayvnAmLQYLpJ 0Ilg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574377; x=1689166377; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oGhLXXBoQ6UI1vHMOyV7YwVlIGSV+5Rfv8inY3ASxdE=; b=M/sIVba0+fgMm/SfKMVLyQpoH14TdNc6XXsN53O6c7148ihZtxaX4dsDYIb57y3937 r8wmr/lQuzr+48fbcHatOm79xocufaRPaArSEz6J0zc1I7Z6rrrlUebSbTfQR79APeBB JoAdEzoEFy/V0Gx/Dm19zyCq9g59nZ6cV+h/W9zYypU7kVG9NdSzNlWhC6gqHfEI4oid eBL+7diObGouX8AzJqtoSmWDzLf1vx7gavOaGTNHe6gk08F/cNHRSP1k5behEzND7hAc NrbqwvVgAEj7+tWFuNnl+zn87oQdXOYuzy/8nk9yf5I6TcQ3ZY4HSSRRzydz0cg71FmQ Jxig== X-Gm-Message-State: AC+VfDziFNEfWZtqeqjH4Qm19WCI3gh0vdQnj1UW5fT6DZuiSWhdp/Zz eUM7eempOZNWmD4obApCS88TPt0ktrg= X-Google-Smtp-Source: ACHHUZ4LZUb/U+NxRdK/GyBBqAXtd4pElxin0Tm8j0AV3UXAQgBOW9ptLs98CPPQ1h6ZQZ/iQNkt2w== X-Received: by 2002:a5d:594b:0:b0:30e:59a2:3d70 with SMTP id e11-20020a5d594b000000b0030e59a23d70mr5416980wri.43.1686574377123; Mon, 12 Jun 2023 05:52:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id cs6-20020a056000088600b0030ae849c70csm12454611wrb.37.2023.06.12.05.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:52:56 -0700 (PDT) Message-Id: <1f3c9e8d417d2c9f16583da7609e8f322059f1f1.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:30 +0000 Subject: [PATCH v2 02/25] completion: complete --break-rewrites Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 90fe292459b..f07b00b9c68 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1753,7 +1753,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --diff-algorithm= --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic - --textconv --no-textconv + --textconv --no-textconv --break-rewrites --patch --no-patch --anchored= " From patchwork Mon Jun 12 12:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276466 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD98EC7EE23 for ; Mon, 12 Jun 2023 12:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236078AbjFLMx1 (ORCPT ); Mon, 12 Jun 2023 08:53:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234965AbjFLMxQ (ORCPT ); Mon, 12 Jun 2023 08:53:16 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0106910FA for ; Mon, 12 Jun 2023 05:52:59 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-30ae95c4e75so4242297f8f.2 for ; Mon, 12 Jun 2023 05:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574378; x=1689166378; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=+M0/92IfMNu3+ZNKHyADTtuyGLmFRsLqMO6az5RJJ1Y=; b=FhZS2I+ceiyVM/GYbRgJyXM/sQ/mJw0AGepi9ROH2rYBhTh8zrln4v1ZOaRd8jmzpp UYJddc6z9C8wSBXc4Zhy5Bwl0YzykMYzi95rP/UCXiZFCyw7xC6bz4cxooRdkvQvwpt/ VKPqn1cCr4nhCsOUvmEi0sR1mq/y563guzkHMp6xPjy+0hKn3OFavBJ4FEgyvSlYBG2p 2APrPwMAgVYETE2HwxJNcPGv0W0gFYu68WGa+DrY9TBkTTXiBH4q7fJlduki38y2Kg/E Yb6ARk3dk7+dh3e0OUST/omu4ppcKYuOQDvsfPCwVgxxanVFPcKF57qz5MOzzhU69zjk 7kYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574378; x=1689166378; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+M0/92IfMNu3+ZNKHyADTtuyGLmFRsLqMO6az5RJJ1Y=; b=lGDX8qZwyK2qkZu8nnjR84B9fgdQMQWTjuZdPab86APYjdZouRIDd2nOHR8O3stplv rbby47RGZxQAj4r9UGwjS0FTGyNYIj0u5PTClPysDAK/xfKhNRVmL8bVsLZyJM/qT8kK ZH5L8X0JXjFGKYhxHiLyKORMy0kOW41XWOb/PcB6vdykzR5CLEh6CYAvtMYyfFw2r56s nGos9heKp4I0feB+yYas5dXjqfptcKPoF/G8WKIBGWadm4vqA0uQYt3PrAiz9st2vtcJ 8+2VHJIFpMfuuOwlnUiHjTHYTmNJ95GrRfD1O903ndqk2TgtXaGcF9avgJNtiEzV+vfF SHYw== X-Gm-Message-State: AC+VfDy897jMpOo4/uwqS0GbyaWOABkC2q76MBF0jrujGHdUQOFR164o 6Da7v0xYi+z67Q3owllkLGk/qIl/JRc= X-Google-Smtp-Source: ACHHUZ7QraG+gqqYrmHR0QYe+WqemliUl2XzxObeV/DI7MLu3qkWoWq7W6AKtzHUnpheOqrxSw2XzQ== X-Received: by 2002:a5d:448c:0:b0:30d:bdce:fdbf with SMTP id j12-20020a5d448c000000b0030dbdcefdbfmr5459641wrq.19.1686574378101; Mon, 12 Jun 2023 05:52:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b5-20020adff905000000b0030aedb8156esm12281962wrr.102.2023.06.12.05.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:52:57 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:31 +0000 Subject: [PATCH v2 03/25] completion: complete --cc Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f07b00b9c68..b61c54e37f7 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1754,7 +1754,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites - --patch --no-patch + --patch --no-patch --cc --anchored= " From patchwork Mon Jun 12 12:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276467 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFDCEC7EE23 for ; Mon, 12 Jun 2023 12:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235766AbjFLMxa (ORCPT ); Mon, 12 Jun 2023 08:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235689AbjFLMxQ (ORCPT ); Mon, 12 Jun 2023 08:53:16 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27DEE10FE for ; Mon, 12 Jun 2023 05:53:01 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f60a27c4a2so4754044e87.2 for ; Mon, 12 Jun 2023 05:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574379; x=1689166379; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=b/BSvPlpPQ+gzO2pSRwkDZXAM5xHHZSyB4ue8FP/Dok=; b=Yz6FZCgq9mUVH4k4BNG+B7SN4yhAeQRuAKsX6YBYyGx3t2LUcA97u+qGuZJqqAk/Ve PMVnCcFdgTBAUmAY4m+6o3Da5+4TqhCXMmwxvcJINL9g7iTPKgKKARER+WWvlpd1F12E QJFFP6LqpxhgVP0+8rUBcJLNOH2zDQkfa3ega3eWtDLHYO+HhSUGg5xkUEhjn+8YDTkG sr1GYIKn/3pB7Ua3xClN6g16SF4ZyP9J9UWwFz9m6vcU8y5tfE5Vq7NbAGKr9aNP3nLG ABvOre+5CA8Vtl2Ef86LUsCeQNY0s9mVTXjwrfAirO/1wUVMlG2CfU2fqrBSEJOwU/QS rBqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574379; x=1689166379; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b/BSvPlpPQ+gzO2pSRwkDZXAM5xHHZSyB4ue8FP/Dok=; b=hu3wKjkR4UuUDCCYO/s4VDu2hD1cCKZz+mjJo0XPIROqLncRC1dRrn1QLdw8xR3JGj xrP6l+SXAYVwjWclqUUJDEwiVUofXU3UvrSsiXg1WvqDXzl17IAD7dF+9vtbAueN8Eot vu5E+uAHEhun3bY9LbV+1XjpXVQpMstdUY02sZbifjophmp0wDRbOi9bLk5Usf71MnP/ gNIZvrHbdYrtxnUzknc2Xi893RqXMKcw0AGJa5eHD2G3UxR/67kWKjWDeApR/0ZwtAgZ fERY11tZSfdPRHa6xLKEnjRJsL+2UPO/vloFAWNSVGmRC7n7bwengQOSgblNT0jwj9wo pj4g== X-Gm-Message-State: AC+VfDzM/NI1eMh8npyfXc05QUJbrXK0DTtvthV11i0FcgwyzD7DsUF9 TdYtJ51xt+ybL87iAs9ntC4egJyF1AE= X-Google-Smtp-Source: ACHHUZ7YLZcgmFbp3E9hFiABjBCNxlTxytAlxB7qEnZw71kpGB/SHljx4qq7gde/UiVqPXsJAwnqTA== X-Received: by 2002:ac2:5485:0:b0:4ed:b4f9:28c7 with SMTP id t5-20020ac25485000000b004edb4f928c7mr3721904lfk.6.1686574378959; Mon, 12 Jun 2023 05:52:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f5-20020adff585000000b0030796e103a1sm12555700wro.5.2023.06.12.05.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:52:58 -0700 (PDT) Message-Id: <51024ee2f2c4862d223e10ae4f193b8e0aeb1c60.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:32 +0000 Subject: [PATCH v2 04/25] completion: complete --combined-all-paths Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b61c54e37f7..58ce64de9e2 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1754,7 +1754,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites - --patch --no-patch --cc + --patch --no-patch --cc --combined-all-paths --anchored= " From patchwork Mon Jun 12 12:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE81BC7EE2E for ; Mon, 12 Jun 2023 12:53:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236202AbjFLMxn (ORCPT ); Mon, 12 Jun 2023 08:53:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235691AbjFLMxQ (ORCPT ); Mon, 12 Jun 2023 08:53:16 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2609E1700 for ; Mon, 12 Jun 2023 05:53:02 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-30fc50d843aso446143f8f.3 for ; Mon, 12 Jun 2023 05:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574380; x=1689166380; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Mkt0tgPGKfg5NkOEOLf6K3kF+oWQxLyWGbxdvLD95AQ=; b=sMVcgpTIiWrgsB94AmyYjh117bKoudYXa30UHNHiRZGUV32W9U471aP/qj/yDdqAkq tUzV/6xv1UpfBxL5iNIZn1cuzabibppVmkA+gCrSFFADvueeFFnnDiGj7OL+dV4mbOQV f9ExwN2fK+qyQDCIxUPykUMSjx7Rgb5N81QRb+S+2OiecMfQXIJcGpqkC/TsYEpv0V5H kI1cTqiHexAtElbNmhcKNgKtyGnhn9zh+wKdjHk81x/KN2t3z+QnOsupALWHXPekRd1K GLX7j0Vgshs1aw3A9xWMuV6IXTtoPuO/sY/u47qG1F8HadhuL9sbAlaV3mAVFVLOWnBz ocKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574380; x=1689166380; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mkt0tgPGKfg5NkOEOLf6K3kF+oWQxLyWGbxdvLD95AQ=; b=MzQxyigyOqzcUglCTb5k5H9XK2GPryvEXAqaLmDpLIBa1E2Ovg8Sp7M3A2WA0RgBcF RpU40nU05ar6rM9FgqBRMzdDygDxHMOWRQDvi4t1tL2X5oMA+EWaaRHJvMisANEGBV6J 6aq9BboCaN6lE7eZKnCsC//hDWtk6O01rM4G0c2G62fDQzEUGEE+MiNHC6tw3TokwivA 1aAuDw8tEacpm/oAATpZ3oYEP4lhgsp54kW9wa6MnuX+p+lqLB5AeP9XNCHFKPfWGQCB VRqCK7xoLrxVDOFhH3ZX9HTsllx1GDOV6EPRdwi8t3RKO86oHpESnavaw4WrHHsjHRYa KltA== X-Gm-Message-State: AC+VfDzQaijPld1yUhM0ehWebJ/Zo5jhUxvEeeQRD11EQ8QnvGL3hmHS xdGfFMoRdCpxFuTReYGRF+TTBNG+Ycc= X-Google-Smtp-Source: ACHHUZ5hrNux9ovzDMA9y+a0ng0FBaBGCmTJByJT4+T5k0Sv/F8r62ic3cfJsSPOVqErLm2AHCleJQ== X-Received: by 2002:adf:de0e:0:b0:30f:b949:f7d1 with SMTP id b14-20020adfde0e000000b0030fb949f7d1mr3344484wrm.63.1686574379900; Mon, 12 Jun 2023 05:52:59 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y3-20020a5d6203000000b003062c0ef959sm12450052wru.69.2023.06.12.05.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:52:59 -0700 (PDT) Message-Id: <63d70d645e25a2e7f9d3dfac7f6b01c3bd27fd7e.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:33 +0000 Subject: [PATCH v2 05/25] completion: complete --compact-summary Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 58ce64de9e2..4c43d13eef4 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1755,7 +1755,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths - --anchored= + --anchored= --compact-summary " # Options for diff/difftool From patchwork Mon Jun 12 12:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276468 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C715C7EE25 for ; Mon, 12 Jun 2023 12:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236098AbjFLMxc (ORCPT ); Mon, 12 Jun 2023 08:53:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235723AbjFLMxQ (ORCPT ); Mon, 12 Jun 2023 08:53:16 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 148A4E4C for ; Mon, 12 Jun 2023 05:53:03 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f730c1253fso31760015e9.1 for ; Mon, 12 Jun 2023 05:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574381; x=1689166381; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=8EuEC7ZPeXKOGDsEdiD9s2S26+adBCwfD9y21ZQNkMw=; b=GLlmgiEZVM/TBvUS02Hax+guf5YcxeN6dMDrz1ghcXAS49j/CQiCMAHPEThaPhysCz Aa+72YVJ+b+dRuaV0phXUrNhlfgKlEV7MUw1Z7UWLK10FWijcEnYoofg8yGrmgbo/gfL IOJNaM8y0cwkQot9dmY2BrCUeZdQxYl/9MA32sgtn+v1YmROseSxHqYDRXoL/0ongNPd /JDz9mix2yMXb1xYs36p8ZqjVJc3iBkvN5YUTbZiseSa9KTMClMXihh6GtRbK5PZbEKi 73VWAFYzr6VyXYv+e3xjAVIDHaPPugjsrIxp473BZVwLHwpX2nzYmgFERGwFQlaFoZ1h PBTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574381; x=1689166381; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8EuEC7ZPeXKOGDsEdiD9s2S26+adBCwfD9y21ZQNkMw=; b=lXqUd9csTuSFhSrUX25G4IUb1PF0gDk331wXAFhM24bhCQdSQzPVh4ss3KNDIi7kwN PjMQbjVrjHtj0gibPVdhXWNwdqKhPc5oPjimL6JHlEmZOUpYj3Bg84bn1N87W2pkeEnV 3bT8+7yieFHQid0lefgu8lm9dbxms00G6hy6dQHTb3an+Tnzdek9Q3ZRSknCFY19x6D9 pZ9BODPA079WI+6ARU+p+vw/DI7thkySudkp9nYPPxFiefYYv18VHJ5yWongqS+FUjak MZ2sYKWPUsxeAgQiY/rQv7joXj412yLNTETYqYQgdaCMr4y0JwRrIQZnzo7EDszGRFle RXvw== X-Gm-Message-State: AC+VfDz0xpRAumtS6/QuINmSzMYpDhllz+yfLO/14v7mitHKDORYK2+/ 4/nYph2TjdvwfR5qFtGMPgLnz12rZjc= X-Google-Smtp-Source: ACHHUZ5O4LlHEMW04Z/D89OoU/8sUy6Z8YBXtprkVa8v05c4hwe9BuWOUZL0bdHbSgtLlgqdVlktMw== X-Received: by 2002:a1c:750a:0:b0:3f6:69f:75cd with SMTP id o10-20020a1c750a000000b003f6069f75cdmr6319862wmc.0.1686574381135; Mon, 12 Jun 2023 05:53:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o16-20020a1c7510000000b003f7e6d7f71esm11388373wmc.36.2023.06.12.05.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:00 -0700 (PDT) Message-Id: <7296a3a8c9da5287cca85c61af342dfc647fb2a8.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:34 +0000 Subject: [PATCH v2 06/25] completion: complete --default-prefix Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4c43d13eef4..6af04932a0a 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1750,7 +1750,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --raw --word-diff --word-diff-regex= --dirstat --dirstat= --dirstat-by-file --dirstat-by-file= --cumulative - --diff-algorithm= + --diff-algorithm= --default-prefix --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites From patchwork Mon Jun 12 12:52:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276469 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC8C6C7EE23 for ; Mon, 12 Jun 2023 12:53:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236103AbjFLMxg (ORCPT ); Mon, 12 Jun 2023 08:53:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235721AbjFLMxQ (ORCPT ); Mon, 12 Jun 2023 08:53:16 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F1BD195 for ; Mon, 12 Jun 2023 05:53:03 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f730c1253fso31760055e9.1 for ; Mon, 12 Jun 2023 05:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574381; x=1689166381; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=con+oNf6coEKJAsHN/zehDywaFXb8TeuAbNFWjVUlrU=; b=Y4l+OWVSAHZLh47vOgNHh2B23CYzdvdL2HeNe2VfNfQgUa9/XlwDf7Z1gKpoPbsBg1 MDtDEibv4hMgVI5pLq7FXV6ywiP0plKvYxsv6s5mpN1b6jarh5vGcR0ekIj0M1KITe4S nNRamwx8Tbdv44G6PgtjFnOxDfRITvFX2mgBEp7+OxCGmYwFWZLrPKzOrIcbfu1T0tOA smmppQzQMeJZK8OH7NP8AgPrZs72r1DVmPswlcw3PzEgR1BZZvtZ4pRso0ifNuiBC+sz 5cPkhlRhJWOl20OnhBhcL5H3RLUXz6vgZzvy3wBOGreGIk3gT1iorPtXQbXqe+fz0hxt iS7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574382; x=1689166382; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=con+oNf6coEKJAsHN/zehDywaFXb8TeuAbNFWjVUlrU=; b=FHktznw7lRysQYqS0pMsFnzkBkmpoWQ/m/6XXtzDjMxB5AFO8LkCKDNds4e9jeFfMa 9/fIadvIe6EBBJt4H0zDPgtGK8gEnHezAehQQTKgVCGU2L5gjnN2/3kp+qd6tQKUr/yl 20jUriWHP1QSY3D33KdQQ3F9kees1HWBWmYOBA9Lpt+WAtdmKPpr4CCWPdATe+iDBaL3 QZP5ypPk5H8JTfe0HJ3vQCcskHx29T1QJa9vLmsGQxSUlu98MeqA6tYotSrafHdF1xnT pA+JYVsokq5auZkPIIZGG0ZweImmLW6Mxq4DtKO/WVcUca3tq1CJh4gj6ZVcUmK1WB+2 WtGA== X-Gm-Message-State: AC+VfDzDwo7C54+mzSUfXa9fggQVLBH7kK5IMool4WwPQQ5uA7o0EKqT +W+GBQp/6QMd9407rMTDRdH770a4+TA= X-Google-Smtp-Source: ACHHUZ6RQw/AwXgt13EZoweF8hgsvWdVnxERZWyCJcLnQbwaomeUOqbEJBvoTkWUnBRmGowX89D93A== X-Received: by 2002:a05:600c:24c:b0:3f7:f398:e1d5 with SMTP id 12-20020a05600c024c00b003f7f398e1d5mr6299438wmj.29.1686574381675; Mon, 12 Jun 2023 05:53:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z21-20020a1c4c15000000b003f80622bb65sm10400401wmf.12.2023.06.12.05.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:01 -0700 (PDT) Message-Id: <1f9b213cee5a4c6325c7fa9528180e46aab7805a.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:35 +0000 Subject: [PATCH v2 07/25] completion: complete --find-copies Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6af04932a0a..dd6e12ad8f6 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1740,6 +1740,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved --color-moved= --no-color-moved --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= + --find-copies --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Mon Jun 12 12:52:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7AB8C7EE23 for ; Mon, 12 Jun 2023 12:53:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236183AbjFLMxk (ORCPT ); Mon, 12 Jun 2023 08:53:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235757AbjFLMxR (ORCPT ); Mon, 12 Jun 2023 08:53:17 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23BBFE67 for ; Mon, 12 Jun 2023 05:53:04 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f7f6341bf9so43090635e9.1 for ; Mon, 12 Jun 2023 05:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574382; x=1689166382; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ztzLL4KgmrtUPgRMDMXzL1umxszvJ1+RIMd9x/Qs+L8=; b=WKLjwJTtwdh/Hr5jdI5YfBNdnuMm8ObFJLzVsIOeVjRTvSGRoT6JjM+ZyecZv8rIwW hH2hD/ZTo6CxERaBfvAJrUn8UFmZYolwuyLg7lkNuSkleU1FqcDui8upmjUVeJsWj/BK b/biITJVgCZhxRIijGQIofECcQhdQqrh4QwcGOXyCECGunowyF/OQ5awoz+It2fHRsj4 dkQwGNyP08rNHc6B0f7SvwY8OVnZK8CSV9/i4x/0reXsZG9ciIDm/XNPgv3jxXZ1HlkY yxCzS8qtvmbC6absdrk/0pj9Y1j/dDnujlmpzIKzRUxcROxhAKT4btYxqcHMLEVYrEoj DtHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574382; x=1689166382; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ztzLL4KgmrtUPgRMDMXzL1umxszvJ1+RIMd9x/Qs+L8=; b=OitPJj4ge/4Ysqfq/ymEz2YZA+KlZplYTNplCsvuOb8OAruuPbbQeBfzscQmr3RBhk cA7tn4pfTkqHcsSU0z0QaJtQ6zdJNgrcKJ8qKzlEYueGEOC6XPxrIs/3s7ai+vEw03iL n3zRwweI+ybL9iXXEtQ5uJrBZhVvHQVMZ5+mwF2pCHsk6KBZeZaaPXmKmGisCH1h5aHm 2lUc64LViSFBjHKaainBTbRo06WvC6x0M5ycMbhtHpuUwgm0zMpgXbbSFYU4v+8kRmz/ O/fY/EaMCgkgU9+w6R9tlDwAMiftQzIGspfnQx8Q+ru84HAhWA6rX+QI1lBddTkzrqac jEqA== X-Gm-Message-State: AC+VfDxktJC+d6tIn5MSaomguGZCa08JvCg55RusIbOewd+XFqSCMKAE Bu4aXawo27iLwugXnrEioQXrDO4uNqo= X-Google-Smtp-Source: ACHHUZ5Soh3y6kQbhT7Btdpee6SSy1mCpruDpiY2jn0V/AYpqhHXnzlNmVwLlQTD7jCObPXhPThrzw== X-Received: by 2002:a7b:c84c:0:b0:3f6:76e:604b with SMTP id c12-20020a7bc84c000000b003f6076e604bmr7099744wml.0.1686574382408; Mon, 12 Jun 2023 05:53:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p18-20020a05600c205200b003f74eb308fasm11303166wmg.48.2023.06.12.05.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:01 -0700 (PDT) Message-Id: <53b1c348f822ca32228cdb0f40b03c9ae9ec59c8.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:36 +0000 Subject: [PATCH v2 08/25] completion: complete --find-object Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index dd6e12ad8f6..392fdbedd9f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1740,7 +1740,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved --color-moved= --no-color-moved --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= - --find-copies + --find-copies --find-object --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Mon Jun 12 12:52:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276472 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACF92C7EE25 for ; Mon, 12 Jun 2023 12:53:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236195AbjFLMxl (ORCPT ); Mon, 12 Jun 2023 08:53:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235727AbjFLMxQ (ORCPT ); Mon, 12 Jun 2023 08:53:16 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E92CE6E for ; Mon, 12 Jun 2023 05:53:05 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-30aebe2602fso2807745f8f.3 for ; Mon, 12 Jun 2023 05:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574383; x=1689166383; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=+2WpL2LnEIDybO0wRqkmHT0eENwkULnxZnfbhvEDvYk=; b=n2mRQOGATPKpiuaMfYl9XruwR85sKwmbIMl4Gp4/Lzi1qb5mxgKHIsMkrm4IEBJ8QP sT7y0T8v6A4DF59EaTnuoJ+vhlYtc2rfn9dALOAnUQGbmQMdnZlKaZlc7cTv/KO2tzni CGYamw27nxCyxvDsBNUvu6OfK12D/iiYoBk85886J0cs1spVTf/TseyIY4U2B7+o7AMi k+8BTCganGviF+94cvJ/bVh+V7+4Hnnzvh1zOrdRDgGVrlkxa/YSdmvvgrNx8DZfGHGj cbsSC8KOTndYHRTNqq645PAbwVYfLgSw1a7705xmiKb/yPu/ImWdmCaHzoVjg0BjSTsu 4TKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574383; x=1689166383; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+2WpL2LnEIDybO0wRqkmHT0eENwkULnxZnfbhvEDvYk=; b=FHZk5sY4CB7Zv7d8osDvLaki850ZhN8jvnHUS1wpcjW/yWn/waQVhLyVC6u4STuPS+ YkTYH0NsHn3z1uxhSIbY7w14IK2CKYVStEZE7Q0Hihezjs8BMTIyKiTQEuf1syqFmcmN 7pci8e2UtaO7eyVHHvKNTpmDxPvz7lQW4cJe0y3OMZdIvGgY6PaXAv3kDZh5yQZgw2yF TpjEdiHhYBgAmP7TF13sgiRrJQM3I9j744bhGJWgAog0hW/AtjlmecN2WGhOcgcspwkI fgdCOyWluUoIQblVGQhOMJV7dHWqq6v8ZK3rCK7XN/uXqGDlW5DWcZwQEKrJuVVzzWn1 T7YA== X-Gm-Message-State: AC+VfDyWqH4iJABCtaKyPqABZylS7PqiQcbqwpxN90EajdLlu4Xr+w25 wHjqsVEFgEoXQhV98Kfq68i8simhtwU= X-Google-Smtp-Source: ACHHUZ5ndqNiEk+dvwD7JTdrhKAAtg1SvJAz+U+NKUEYMa7lgAaeh9odFnv2LMmHV/LIPBOoB4AX5w== X-Received: by 2002:a5d:594c:0:b0:30f:c423:bac6 with SMTP id e12-20020a5d594c000000b0030fc423bac6mr1501170wri.53.1686574383323; Mon, 12 Jun 2023 05:53:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m11-20020a5d6a0b000000b0030b5d203e7esm12422931wru.97.2023.06.12.05.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:02 -0700 (PDT) Message-Id: <053f9e8620aa369f04eff8f1235eb57d15fe8755.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:37 +0000 Subject: [PATCH v2 09/25] completion: complete --find-renames Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 392fdbedd9f..0fa86dcde6f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1740,7 +1740,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved --color-moved= --no-color-moved --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= - --find-copies --find-object + --find-copies --find-object --find-renames --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Mon Jun 12 12:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276470 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3E58C7EE25 for ; Mon, 12 Jun 2023 12:53:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236143AbjFLMxi (ORCPT ); Mon, 12 Jun 2023 08:53:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235764AbjFLMxR (ORCPT ); Mon, 12 Jun 2023 08:53:17 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD85DE6F for ; Mon, 12 Jun 2023 05:53:05 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f6e1393f13so31845965e9.0 for ; Mon, 12 Jun 2023 05:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574384; x=1689166384; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=RknSMSJ6jkl1S2ky9jZa5xqSyZHqjLkO+0dQYVSmL5w=; b=UZfDtsHCLYYWJdSUP/15QQ+WKFV0wJO09D2ctFk8+IH0mTUoeBOj98+ny6DE6ZRjPV 1FPPGGDBoV/Pt1IupGEhI9hDlJpLoc8DDraJXsQ/+mhtsqYCFpCNNk5zS4dG70ENOVw0 P1wjaG6ig0uXInAQDQVejtaeCBsougXf687qnbrJLcKpXVa0aI9gaS97If+JEPBCDXZ3 0yoLCDBGWgGagyraIFPA7T4G/IdWhEgcIrnQF8Ht7Irqnm8mbbHx4n9C0j/nMzEZQ4gY I7JwlKMubCwtibb88hQkcm1LfNw9AUIqxgDYLLG18mrMj/HpdeA/XHGiAPxohVF8q4h1 iwUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574384; x=1689166384; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RknSMSJ6jkl1S2ky9jZa5xqSyZHqjLkO+0dQYVSmL5w=; b=hj83tgTL8iDbbcAHfwP8OEXWQKxQvJcoNZpPknoO/fnJVQkpZLsuKxVbzz4iH5OoBj jZc8zZprM/hL7crUgQ/dm2b/TlBeUw+CT1V3sOsroa2JGrAhcHziDt/UIpPT/DYapiSG 8FLeCEDghHGzQhm9D5edi/PSEpVOvUTDEwCklYU/p6m9gdJddqpVVjOCAm1lYtYm8UXg krKfWVAjSqkBpSRBpYoP8/W2Gl3Rikr8aKvyFo17JuM8U3VwDAAQK4sWwZoPISEkZLe8 YQyKuOCm5uzOktVNhGqgl4sfUyRZstceYd4r/brxrsJ8xSS95vrRdkXrTxXrOdb3ST3A jdWg== X-Gm-Message-State: AC+VfDzUYpu6DjvO2vwEma7JaOPuxlk+0ynwlnSgDG69RwL9MyjhU1fx oLdNqLvS7a0v55lrp1VrLUpWPdcyP1s= X-Google-Smtp-Source: ACHHUZ7lSzmtNoe2y7qlO1HxRhosLmwkmJEEBLvXRlXMP/WnSCfgh1FTEcKaZnVESLgosOgk2Ec+Ug== X-Received: by 2002:a05:600c:cf:b0:3f6:41f:5a68 with SMTP id u15-20020a05600c00cf00b003f6041f5a68mr6459601wmm.29.1686574383997; Mon, 12 Jun 2023 05:53:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k20-20020a05600c0b5400b003f4266965fbsm11443423wmr.5.2023.06.12.05.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:03 -0700 (PDT) Message-Id: <2503d990e5c7d1fb5bbf06493951204e7c00ea09.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:38 +0000 Subject: [PATCH v2 10/25] completion: complete --function-context Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0fa86dcde6f..2610a55487b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1746,7 +1746,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --ignore-all-space --ignore-blank-lines --exit-code --quiet --ext-diff --no-ext-diff --no-prefix --src-prefix= --dst-prefix= - --inter-hunk-context= + --inter-hunk-context= --function-context --patience --histogram --minimal --raw --word-diff --word-diff-regex= --dirstat --dirstat= --dirstat-by-file From patchwork Mon Jun 12 12:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276474 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19765C7EE23 for ; Mon, 12 Jun 2023 12:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236209AbjFLMxq (ORCPT ); Mon, 12 Jun 2023 08:53:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235329AbjFLMxR (ORCPT ); Mon, 12 Jun 2023 08:53:17 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81F4710C9 for ; Mon, 12 Jun 2023 05:53:06 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30c55d2b9f3so2783378f8f.2 for ; Mon, 12 Jun 2023 05:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574385; x=1689166385; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=vRxPtMHjcUedxPPl4bnw9YSFm+KCnkrh/mX3WuAVtFk=; b=re+BvAIPqFM/cvmEaLTSgkh+IIIovBbH41ANbZLhPO0DyVI6QWb/Nb81BTY1eEy147 VlAxb66PI//NZ8FCbQjNOlqoEn94WMhcJNbKwR0Rt9jyAiNeZB5Nvvyu0Nr+kUCOWjT8 sb4pJHtT2FHQBvD2dPCZ13JG3bJpEWhrdFhBNZMyQ9M3p9tmGGhnbVa0uaELHUbfmHHT 0jD/z7e90o61ds+2Ynn3msYeFfTvuSirRRJ3ysrIYMUa4tegnO/JYbpb2WLFEs8ewYJW ky0Nj8uf4S7tnT5cMkSONEmAQSc0QaN+3DXQUr+rIkr2IqthNnrhjrv4yzeFHoIUj/3D mSRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574385; x=1689166385; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vRxPtMHjcUedxPPl4bnw9YSFm+KCnkrh/mX3WuAVtFk=; b=TGwNL3/BEyZ4TBXLSiNFKu2YC2fvY67gJy996WMsJ5hlJ7COwfMFeIKKb2tUr5FA3x 2kvzd5bJ9jqfomGOdma64nw6jeQfv1xEjoTmV8X/UPHg6a/V6T7KycA/W/dFv2AiD79O aBrtjv/OP9ky5+BpFuel4VZdQYOsPLo7CuU9Wx7rUZOjNGZkZ8L77fw+pqHPQEQnWOQD BhQ+rH5OQ5HmGly/4BaN6gNBWsdIJSoEHpaQ7UsBwHmP2meAPbyVOI8r4/eLAf9dM1qo flHRXXXQp+vcTvjEkXUIRvi4udZTG/prhgL/XdxF2g883+3KAh0morW2BwV4BY7XCYoD 5xZw== X-Gm-Message-State: AC+VfDyeo/+RAAzwDVArr8Kh6WIbfTFm8zyyGT8dctsvHvxX2wj+ZIcS lLG8M9+CnQN1EtQ3EnEOLKAauW7ERlA= X-Google-Smtp-Source: ACHHUZ6ZHpdC7MeOQvVIGzBCslIUNeBKSK7q6pBpDDFGcsRVPkh1n06/+jWcYwjeLn+sTrNSR9yHzA== X-Received: by 2002:a5d:65d1:0:b0:30e:4886:3533 with SMTP id e17-20020a5d65d1000000b0030e48863533mr3702822wrw.34.1686574384785; Mon, 12 Jun 2023 05:53:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a8-20020a5d5088000000b0030f9c3219aasm10255244wrt.47.2023.06.12.05.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:04 -0700 (PDT) Message-Id: <8bd72945a2ff26c96cecc83abc07299ab51d262d.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:39 +0000 Subject: [PATCH v2 11/25] completion: complete --ignore-matching-lines Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2610a55487b..b4d0643b049 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1756,7 +1756,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths - --anchored= --compact-summary + --anchored= --compact-summary --ignore-matching-lines= " # Options for diff/difftool From patchwork Mon Jun 12 12:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE7D9C7EE23 for ; Mon, 12 Jun 2023 12:53:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236213AbjFLMxr (ORCPT ); Mon, 12 Jun 2023 08:53:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235513AbjFLMxR (ORCPT ); Mon, 12 Jun 2023 08:53:17 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42AFE10CB for ; Mon, 12 Jun 2023 05:53:07 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f735259fa0so43582315e9.1 for ; Mon, 12 Jun 2023 05:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574385; x=1689166385; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=yhDEk93Fg0o2c/F17D1rZD+k18ouO62Bw/yMg100lUA=; b=iD944WS0dVubupUSBzWE9type4kXprD80YE7Yr4K9p7SWt57eNkyPVuLeZpawWLxqc Nnsum/3jzXxhvwabh+Rz9S0dsTuQzZF6uynlXYifcnbrTxsV8wowYTemRr/e3sMSxsaq 4lfItEnuxJGS+FGzw21Of4+PeMpsmTcn3r0A3qlK1tNnGW2t3oJ6eJai4BWSSSaP/i49 gT1G0h2nmFubDl50d2o0LjgTK1Pp3UpXdi2jiedhRZ0SU3LzV8jMckVYGxwQIaZQSR4B N2UiNvEDGVBqeqB1yqCc11TdYwUN0rUM13kpbS+8fdGo+/MRpHWo2519nrcbYSFg0bbi nPeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574385; x=1689166385; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yhDEk93Fg0o2c/F17D1rZD+k18ouO62Bw/yMg100lUA=; b=Fn5Zyh3zlVU9k/c3cdiNftovqQCzW4MTf9yr44PdJEuZL9pOvmNBytfGlmnpVDQiMl RbdSOH9yZWMPymqDsiHnmTyK8SB7GJj/1ncNT9LATkiS573cEM7HhBG5OwekODkNXox5 hN9H9UkVmWgoyPdwlV5iAfLy5hvXsWfcDjQjkWiWaVoe3GPa0ytbwylA2irjODV7GX39 KCFM4HQcKOR8Y5SL4+eCkzPAjMSRZX3ILalUq3IGq3bUk9GMcDEFYPIceHqS1BlpUG3p AYYHw3Xss0J3K6WLWSJ6XWZwpD4E7cj9BiiRN07gxhCtOjRUTphpTZQLc8xzlH96APub rbbg== X-Gm-Message-State: AC+VfDyzJJZz0AC50nx6Vexz4P7LHO8hcL+cFUwj+IImNTKsa3MnIzcK mr6cHxooPmDe1y6EGkTGsAZAALM8Vx8= X-Google-Smtp-Source: ACHHUZ5Wk2TWI5IWvTiumZD7W+RVdg1mfP2FuyE4ZroU/tXDOd7mSf4TJWLqSQjxaxzQORfkBf2FMw== X-Received: by 2002:a7b:cc12:0:b0:3f7:f398:e1ca with SMTP id f18-20020a7bcc12000000b003f7f398e1camr7302471wmh.26.1686574385546; Mon, 12 Jun 2023 05:53:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z10-20020a05600c220a00b003f42ceb3bf4sm11397553wml.32.2023.06.12.05.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:05 -0700 (PDT) Message-Id: <5d32e972a0c6e099f1d30d4a2a8cbff6e204b09e.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:40 +0000 Subject: [PATCH v2 12/25] completion: complete --irreversible-delete Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b4d0643b049..e74636ebe86 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1757,6 +1757,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= + --irreversible-delete " # Options for diff/difftool From patchwork Mon Jun 12 12:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276476 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BEAEC7EE23 for ; Mon, 12 Jun 2023 12:53:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236247AbjFLMxw (ORCPT ); Mon, 12 Jun 2023 08:53:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235767AbjFLMxR (ORCPT ); Mon, 12 Jun 2023 08:53:17 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42A3E10D3 for ; Mon, 12 Jun 2023 05:53:08 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3090d3e9c92so4097844f8f.2 for ; Mon, 12 Jun 2023 05:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574386; x=1689166386; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=l05uboNt/LUqosn2wfX53a4vdlSfAxNCZIFmlfGziwE=; b=UcFE2ENlY+wfND0h4eRMWWCNZxcWX6V0OEOTv0ogDrTUjCcpcqDIE4KDG2wLrkZryg uhpRbJNIwt43MwE3miY3OqRmPnqW703+cTlnqTtpeRnqqVcQhQO8GD1nvUR+k0Yp/iXJ dtKQOeH7dwhQjqC9gNftgL9/K7IxiV6iMLuOMrwk6inp7qE3ifGHR/BZC8z6ktO7tRop sj37e662uExwzhWRlfCjfvrl1DT8WMLxexL2IgmiE9GQQ7I0FCiWgMsEEWmnfVgs1eL0 9iYTxNDXjbif6SyNn7BLQhnsQ2NOm7moOTrrtQkkR3zPXpq7VhJX7nFOocWTCySsqvBz E4Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574386; x=1689166386; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l05uboNt/LUqosn2wfX53a4vdlSfAxNCZIFmlfGziwE=; b=RSWAgiNaDYKxfz++y/qEDREBND6U1hyNBwv2JxmPeULHzbxxUm7ldEeijprbQkLJwy SV24cOVR3rKsrmmh4oVfQrBzuYYybo17dy1Ldlzy0EkWFkJqR+UDaU4//xWjH9HNNMzL KNn6/MW/NnX4mXYocAVxVylgT/VRd5VyDgoRD7cMIsGfWiekFjk7WYKyy6ovYqKYJNRA +qAZVFKJkhxGVMkjQeD0wKoYNpEpd7KnrztNUj/58Mh5OuYFrq7t1P2g18DT3j9ePlBZ wbJZGrTyiuLORZYY88FoKqDr0Is6it7bkOy4jCEQz09zu3rdVEjlbWKH8MpszmVANjw+ S4/w== X-Gm-Message-State: AC+VfDwdTnqLbi8/Ne3vy08oKz9nsDV1vg0CLXYr2sq5Nh1LYj8Nnv2S GUZHDsa6wk5qKK+7Ev4m1yfD74HzBJg= X-Google-Smtp-Source: ACHHUZ4MHblWZaZblEOmAlj4WuBzXnzdx6a5KIjcbSPTH5PsRGQRJ8pFF0MgCOUXFcY9XD7iFDOCAA== X-Received: by 2002:a5d:68c4:0:b0:30f:c601:63d9 with SMTP id p4-20020a5d68c4000000b0030fc60163d9mr1143312wrw.65.1686574386491; Mon, 12 Jun 2023 05:53:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r17-20020adfda51000000b00307c8d6b4a0sm12464312wrl.26.2023.06.12.05.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:06 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:41 +0000 Subject: [PATCH v2 13/25] completion: complete --ita-invisible-in-index and --ita-visible-in-index Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain The options --ita-invisible-in-index and --ita-visible-in-index are listed in diff-options.txt and so are included in the documentation of commands which include this file (diff, diff-*, log, show, format-patch) but they only make sense for diffs relating to the index. As such, add them to '__git_diff_difftool_options' instead of '__git_diff_common_options' since it makes more sense to add them there. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e74636ebe86..7246ced14ad 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1763,6 +1763,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary # Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index --relative --merge-base + --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options" _git_diff () From patchwork Mon Jun 12 12:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 952F5C7EE25 for ; Mon, 12 Jun 2023 12:53:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236250AbjFLMx4 (ORCPT ); Mon, 12 Jun 2023 08:53:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235781AbjFLMxR (ORCPT ); Mon, 12 Jun 2023 08:53:17 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8BBD118 for ; Mon, 12 Jun 2023 05:53:08 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f78a32266bso43443915e9.3 for ; Mon, 12 Jun 2023 05:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574387; x=1689166387; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=L+/f/RVZomTkapsMngxop6R26fwIFTVcMJ/LWQ406iE=; b=dZ56MhV5/UuZqyIvSHvxMYhCjTUADUCQRGGj0iFVtJUTqwmQOGQu1Zmqkd9R12WLxU /9p6tlg1iFqX3yN7WaV3r6GvUJh0WL399oAzdxEmJwy9CPD1xDZTU4Kp9DhxFvz2WR2+ Ax4pb7ztxDXPNJHa8ZZbT23fyVkVEv34WQsAn52nSv36avseWAATApT53Fmi+ZuRX1v9 d25liVb+GQFRba68Bee0kF/a0CE5T+SaPAn/ysa/r/e8uJawsx8RjUy4lf1EbwoqV6YS lOWRjbbtRonleH/SvWfV+3dpZqaYCgU3cTM4ocNjKDtzJvTCg82+3cpOpiaWbcaom0q5 UChA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574387; x=1689166387; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L+/f/RVZomTkapsMngxop6R26fwIFTVcMJ/LWQ406iE=; b=EZCG5M6MPL9iSMrBUyB5elGp/P5GSjmtlFm95DU2inTp/gAdkp8PDdkBzy3NiGi5g1 J5FaJZXTbVQvkFzU5SJ1kf/kE5CS7Ev0IuS43J1vECMzg4mGupoeG4YtoBEkA58aGuOP BQAtY0P5tulys1ZnBGNPOF6byeWDdp29AEQsSpCyL+iJ8RYpJDmvKXa1Mna1LjYpkw5d jA9ipmt1Tg2rJt5WPG9KFhcM9CM0tLbLgflXjDyqwLpUv+OYagNTX54J8fVLuCNybRgV 6HCWU9PQL5lr2VpRz/Dy6w2ce9HfP88iueKHG+9IkcCiUPnpTdrve43U65cRK/vRzPWz XTqg== X-Gm-Message-State: AC+VfDyluDGwCetPHs0kpZAAPqNLvi/hj2WL73wDLQCNSCdf+5AIeU6r JABzbVf9mh92wkN4tozk4eAdmr+gJ8E= X-Google-Smtp-Source: ACHHUZ6wK+Uj3j0vWZY3oZPPt+nw3Tyo8GNfVs4uq784SA5SVieKeuoiwTNwHXFQeE1sgQSEOK8Q/Q== X-Received: by 2002:a5d:69c8:0:b0:30f:c1c3:8173 with SMTP id s8-20020a5d69c8000000b0030fc1c38173mr1969302wrw.26.1686574387219; Mon, 12 Jun 2023 05:53:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a15-20020adffacf000000b0030fb3ec9e46sm6417440wrs.45.2023.06.12.05.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:06 -0700 (PDT) Message-Id: <560ad1cd0179f8615dadd8b252b5c3f8cef6822e.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:42 +0000 Subject: [PATCH v2 14/25] completion: complete --line-prefix Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 7246ced14ad..13d6730f33d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1757,7 +1757,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= - --irreversible-delete + --irreversible-delete --line-prefix " # Options for diff/difftool From patchwork Mon Jun 12 12:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276478 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F728C7EE23 for ; Mon, 12 Jun 2023 12:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236259AbjFLMx6 (ORCPT ); Mon, 12 Jun 2023 08:53:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235807AbjFLMxS (ORCPT ); Mon, 12 Jun 2023 08:53:18 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD56D170A for ; Mon, 12 Jun 2023 05:53:09 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-30aebe2602fso2807826f8f.3 for ; Mon, 12 Jun 2023 05:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574388; x=1689166388; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Vt8z2AJxzEwQlYNmo0GCQyhARur9AC9HnVyQAJFP+Ho=; b=AN+8sqldy8RBfmonsKEp2PSeByLcqlOjP/keD/gwvn996FPm+Pxj96llkqnHJ03GXe 1xYVCMHcX+N3HoEIhhGqjCGhBxGJrBu+ZIs0kpMBzG7m3aa+oayMiipueKBR//5j0Xtr PDZMNoOba8fIX8v2xOdGK7fd0CgENR1dFcL9U/SblB/gbh6A9pUXMCZHfwbKvTAkjzrh vkEszJZVPU5b1Eo/KJEaBVfGJOMTdxq/1ntl8vkmvce2s4oN5F/Y4aGZnrD/VjVIxifH ypYPtvOXmmudngJdDo6iZ3dK8j1k66cAj87x7QBy5GLZMDSFYVMhCaQDYm089YuGgbJv OfLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574388; x=1689166388; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vt8z2AJxzEwQlYNmo0GCQyhARur9AC9HnVyQAJFP+Ho=; b=gtUs0RzdS6YVGVedTnojMZxlsw64W7lWtuLP9o76vv5lVghaFLv9U25JNe+cEKnkhr U7RRlj/inYlwH59lvxYZhI9+lUrswgYD7Hs/jbrfQPZhusHYjysz2OIFaLUmVj6lN6vx kIO3R8gHOr6GFT8pbbEwkkD7d/5csSv2D1myZYkzaZ7qoHleKMNtWGtL6P7LdzgY7FYs IcIefDXAvXynK9UdrdpsFWiGfmeRaLK+dAg1OczWDKqGeEoOTIfjge842/3C9Bv7OzQI 5+Q8bkAl5SK1sc3OsMhzvI/aZWLFVdbE+UVntSmH3zJ85e9GWEfThbbXCNURTlX1GjTB ++OA== X-Gm-Message-State: AC+VfDx5z8ilNowvubzYSfuU8ymqvecSx5T1WgDIO2nbdWuDDwaelKm7 DbkPIeVKaEa6794ASv+y4kJSs6Y2UlQ= X-Google-Smtp-Source: ACHHUZ420+pc7gyFixXX72G5VbkiB11WfBjfVlc5KC/Lf4ThVmpH2JWSD05qQllUVjjUw13yFqcuWQ== X-Received: by 2002:adf:cd05:0:b0:30a:e9a9:a4e4 with SMTP id w5-20020adfcd05000000b0030ae9a9a4e4mr3713804wrm.51.1686574387935; Mon, 12 Jun 2023 05:53:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c17-20020adffb51000000b00307bc4e39e5sm12375846wrs.117.2023.06.12.05.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:07 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:43 +0000 Subject: [PATCH v2 15/25] completion: complete --no-relative Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add --no-relative to __git_diff_common_options in the completion script, and move --relative from __git_diff_difftool_options to __git_diff_common_options since it applies to more than just diff and difftool. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 13d6730f33d..f4e773cb997 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1741,6 +1741,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies --find-object --find-renames + --no-relative --relative --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code @@ -1762,7 +1763,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary # Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex - --base --ours --theirs --no-index --relative --merge-base + --base --ours --theirs --no-index --merge-base --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options" From patchwork Mon Jun 12 12:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54CC7C7EE2E for ; Mon, 12 Jun 2023 12:54:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235651AbjFLMyA (ORCPT ); Mon, 12 Jun 2023 08:54:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235619AbjFLMxS (ORCPT ); Mon, 12 Jun 2023 08:53:18 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7773710F4 for ; Mon, 12 Jun 2023 05:53:10 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3f736e0c9a8so31755335e9.2 for ; Mon, 12 Jun 2023 05:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574389; x=1689166389; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=9C4+Z+JYxHOHgPNO9HRTisJPCa1ZLhtMUtS+8PzVvZc=; b=kz+CjkjF7E8vTwPiU7zCTzFTJbKviGa/GOiH2co7KjSlbmBvgRl6hnqeIop793JbTo 2djXY+J75kjzOVcw4W9hW6+vMoOORd41+hSbuBIbmVFGNNfd/yo4J7sLYADwMZ4LVd9Q mxjt9wn3A6xeBHb/Sb0XxyaVmIe/M3WXelax1O5R8Y8mA36bXUEEtXYOy7Gsi7DGkLPI MNycIh6RwD+3MZQeDlnJ0DxTbbOw/ZAa/CqFgUCFKOYWmYyvXMK/2iPFB6EcZhQxwcaG YhillyvCDY7TB1jVJBoeNE14qqoyDKx9NzGMe/HCrncZfgAjlrVrmOmPlCXVH4tzyGvk hcqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574389; x=1689166389; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9C4+Z+JYxHOHgPNO9HRTisJPCa1ZLhtMUtS+8PzVvZc=; b=EZ2rR7xCJkFmXd+Z0DvoVC9oIq8GlWAkvHKez9KnRjALq8aPVros/2+hkLQ5Dvlz1H gpL/x4FHK/FgRArl+T55RZsAWvHYQWPZB4NvF5aRVKiniyIUR5zQ7j36YwqkRghUKwhe yZEGEMaMxIqlAXREZn72KPItV0+N7oOTXJE+x0AT7aUrElco3zMV0rvHnJ6k5Rzuuo1a 8SHFVntP6zE7cnQGJSM6gpJcu6d6gGsytLxQqEjCWPVrl+Ey1gg86A1W9mJc4sEZ75yf 9Asgb7VNaHvQPaWy9y0ghBUkyY9iRlccFLY9XJ7FfJAVJ27seuo2YX9uLAMrlVuy+9Df d5tQ== X-Gm-Message-State: AC+VfDwxghA48pOR1F5CiDO8hEfb1DTkrrJTUNj+sxkhZs7H1rabQBwA PGKKWkS8toGJ+QAhCS5CFI1RDH1Zb/s= X-Google-Smtp-Source: ACHHUZ6+6CKoxLU731pyQ/a4404iF2ViciNXfI1Rx3ZQanbe6vqKzASb0EOW01FyttWaYcRyOJ3OUg== X-Received: by 2002:a7b:ce88:0:b0:3f7:f4bc:ebe7 with SMTP id q8-20020a7bce88000000b003f7f4bcebe7mr6197270wmj.37.1686574388716; Mon, 12 Jun 2023 05:53:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f25-20020a7bcd19000000b003f7ff520a14sm11301554wmj.22.2023.06.12.05.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:08 -0700 (PDT) Message-Id: <0f16a466fd9bdafe0365ee9cf1bce81fc11767d1.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:44 +0000 Subject: [PATCH v2 16/25] completion: complete --no-stat Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f4e773cb997..ec2e4c9e711 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1758,7 +1758,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= - --irreversible-delete --line-prefix + --irreversible-delete --line-prefix --no-stat " # Options for diff/difftool From patchwork Mon Jun 12 12:52:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 156B9C7EE23 for ; Mon, 12 Jun 2023 12:54:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236324AbjFLMyJ (ORCPT ); Mon, 12 Jun 2023 08:54:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235858AbjFLMxT (ORCPT ); Mon, 12 Jun 2023 08:53:19 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41DA4171E for ; Mon, 12 Jun 2023 05:53:11 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f70fc4682aso29924675e9.1 for ; Mon, 12 Jun 2023 05:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574389; x=1689166389; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=sE7FKCR7Q34boOA4FM3Fk6A0qBBnNg8uNK4v55FkdHs=; b=U14j1zBRhnEdoRayTHAaPOB0uRKz24P1FSl6s0m6Z5hjHm22VUHGISYh1C8Ie5Xudq wReE29Ft7E0solhHjkz4kUbAjIRSPTk8EA4UpImPXdKbkKk/cLrX3n1+uKMpvPCY66q/ QpIDqGGpcDvqtQVLxMktrtqSHPs2dKxi2LN4gi5qRmdRqA+0YDtraASZBWqdqLsAqw6o gbUVzTjKyZlZEKbhttmc1UarqbRadhpH0B93Ju323yJAFlLZSkaesGqImrJ8OWib+e47 HNHWGHeyNq8HhjLVRYRJIVNdA0U+27/7QgymB6XdRE2TmnM4EPtd3oaxmm71duvtMp1y eBgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574389; x=1689166389; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sE7FKCR7Q34boOA4FM3Fk6A0qBBnNg8uNK4v55FkdHs=; b=J5vYa0diqiY8AQewqw7dZ7UU/qy+FzlWcYHejcpgxRy3UAhQwFYCXKyUuuqhkJSsRO eLJNOtN6pdEPxH24d6W24kvLQpJnw82qgr8TGo5HzlY0tkHRNDq0x1d3gaEN+OT0ojOF iYdK2lupSNeCqT0XlNW+m18yz3Ipy4zOHHKqf9OHL1HcJcUDalnbgM8vaNJytyL5oKbM 0JsgmSmNSPOYKJhPkS9xFjpQ7x1H2hdvRK/SWHUuCo7VDvvTN36J1v2ZHlE6sK5AvFZd 1ZRRPtf0zEdx1MTt2LX+dJZfXamqI2ItlN5E2vpB1rjpapkFKhyRVZ8awTkkH/jzEoz+ g8TA== X-Gm-Message-State: AC+VfDxWIs0CgJ4qInVcGdlZQ4P73lTWLCyVESGz+zaSyb4d/bd217cK 07Pv9XoXUPINLo8m7seUE3wpFLhh0IY= X-Google-Smtp-Source: ACHHUZ5GTs82oIhBQxGLP2mB8t6/OPvnQv0TaTJ1a7oKzOvvyWDLXe5b6k+O7r3B3uggTzgXTkO5yQ== X-Received: by 2002:a7b:c40b:0:b0:3f4:27ff:7d48 with SMTP id k11-20020a7bc40b000000b003f427ff7d48mr5832467wmi.19.1686574389440; Mon, 12 Jun 2023 05:53:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m19-20020a7bcb93000000b003f7f4b7f286sm11401782wmi.12.2023.06.12.05.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:09 -0700 (PDT) Message-Id: <761c75d4aec988609a105db0f039ad9f15d2337e.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:45 +0000 Subject: [PATCH v2 17/25] completion: complete --output Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ec2e4c9e711..a34432796bf 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1759,6 +1759,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= --irreversible-delete --line-prefix --no-stat + --output= " # Options for diff/difftool From patchwork Mon Jun 12 12:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02574C7EE23 for ; Mon, 12 Jun 2023 12:54:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235903AbjFLMy1 (ORCPT ); Mon, 12 Jun 2023 08:54:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235914AbjFLMxU (ORCPT ); Mon, 12 Jun 2023 08:53:20 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A602E7C for ; Mon, 12 Jun 2023 05:53:12 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f6d38a140bso31654055e9.1 for ; Mon, 12 Jun 2023 05:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574390; x=1689166390; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=icmOegVGKbOh0P8m6bXToPWg2ZvsGRKdZQqlcgh5YwI=; b=OgLri0pVbkN3UpMW2CN95ff2B6ijGmlTt/0welN+dJYsyASk88HVk3Jgej0WIEGH6P wDatvuSdfOu2okzveCmPfkLYc+St17zxN5NNznmfPo7BcLPVA/8bkglJUtdpW11HA8NR czjIB9QtOO6c68fxYwse4ydduhnGdqE7zFLC9Q43oASQIjnKuyRgdWW32nV6DrUQ6Tyg 0wrFq//JMQkLmX7h7XoCnTuR2LVqltALO/xgPV9SFKTFGJmf5rXVwceYBjGmVcZD9mii DImyS8zz7QiMWNL0Le+nC4WyhO1csX8FDP/ZgcLJohe3USdRCRKsXA6V9H0v15ZEqjwr cPnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574390; x=1689166390; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=icmOegVGKbOh0P8m6bXToPWg2ZvsGRKdZQqlcgh5YwI=; b=jhCN5FAwsPzXA/fTibcvuzH82b83Qe9JVImDkGGsJfjQiAbyUhgtvQiMkphEaZh9Bf bkV3zcuKKGbvxS6zix3lusyXgKsp7xaY6++ob+pGnfgU8PE3rrKV+d1f9kRR1kQuSNcc yZQisQTRtD5r8pp6vM9w9h4kzMuG2odUsvrElglF2oq8FLi3qy73gRvZJTKiM6sNDZhO lfc7HDD/knCx5VqRjLxXmDo3SuHjA9dq6zgO3uOYGVUykQiAhRlKIzpQeynFV2aiLBt0 g0YJyuJRqw8+FWcuem3z61F7PXzQRjRC9kebAzxsXey2TNset9NIrngLf+LnXjDfaJZl vyhA== X-Gm-Message-State: AC+VfDz6zZdKN3sJga/SUwMFM9gXOFjdCwNbA7BKBAqEK/Qu2huRmNig cqf7dQ8968npVU+6SaTATM0cHvhHc3w= X-Google-Smtp-Source: ACHHUZ7jpwOrhQZuTtJix2xK4Se3x9GHPU93LvNp1/U4k5GsJau/5lPmY6ASZaO5oqcvv2aX6FuDow== X-Received: by 2002:a1c:7204:0:b0:3f6:d90:3db with SMTP id n4-20020a1c7204000000b003f60d9003dbmr7291238wmc.3.1686574390238; Mon, 12 Jun 2023 05:53:10 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x22-20020a05600c21d600b003f70a7b4537sm11387204wmj.36.2023.06.12.05.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:09 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:46 +0000 Subject: [PATCH v2 18/25] completion: complete --output-indicator-{context,new,old} Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a34432796bf..a69421cd740 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1759,7 +1759,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= --irreversible-delete --line-prefix --no-stat - --output= + --output= --output-indicator-context= + --output-indicator-new= --output-indicator-old= " # Options for diff/difftool From patchwork Mon Jun 12 12:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276482 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86D33C7EE25 for ; Mon, 12 Jun 2023 12:54:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235965AbjFLMy3 (ORCPT ); Mon, 12 Jun 2023 08:54:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235717AbjFLMxV (ORCPT ); Mon, 12 Jun 2023 08:53:21 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FD67173F for ; Mon, 12 Jun 2023 05:53:13 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4f654d713c0so4567900e87.3 for ; Mon, 12 Jun 2023 05:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574391; x=1689166391; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=yRxjfJg1uXE6Fstm9uVOLObk2IL6n83aPh98fojxElM=; b=SjqM2OxTjgMrAvaa9Cp0YAergUGVuo4K+PP3adQIyjwXiKAE4GAZieG7OC6vUn8fIb aU2UAb9QHnLdNmdkrD5cDr+hOGM3be+RLhVqKUMv5LP63iU/rnPk+eb1V5Sb7ubA10mI tqqsmfwLgWEcrDfEEuE3xQ5N4DHH6JkpK9leKIwgbcarWT+rsxieMNDaArr6HLv6mhtT rP+7hJ+PJl5RzmnQKa0m/EsHNwYDW5fcmyVaD0Fz1MWzXts9UmmoPXpgt9R1DdRdZtUx pJQaKiABaLQ/M2EqG+akUvfg9+FFcl8QXHttVL3hxvzTNWmAXvh73brrd8dH2RMmFEH9 LjrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574391; x=1689166391; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yRxjfJg1uXE6Fstm9uVOLObk2IL6n83aPh98fojxElM=; b=BKTr40SmQXS4tIrNuA7BqBDcfHBGVI6rdXYk81ceZwFh78efYQ/3NXyw5kJOXeM+u/ +6kCLY41HpjeXfptn+rIB6NDQtEFow6zy007k0pxzr96rSf4o9q5NrXbtr1UzCeX+Qxi 1itrqVLY0FguUWE3nh3SLao545Q5xI83+1E+hJt8S/vbi3C2Xey+ztwyhH6WyzUMBfpK ZSXHfHlCKKPTF5g90fdsyYab0BZWPaNtWiQrTulAYBiCjzVf19sg81NyAWmBWZv8aLq5 Vf/2FSeGWAvy4CazpSpdW5JiQH1rXiri8U16f59OTgfVJnj3Wc1Nc5Yfekc6OyExJ2xA QxIA== X-Gm-Message-State: AC+VfDy7Jc44DvazfSaZrhig/YnU0G6oVb7qhxSxfP5On50E3K/fBEu6 X79fnND7EdtisF/CjNT4W6TIw1Icv9g= X-Google-Smtp-Source: ACHHUZ6LYWcYqc3LDpCEs2xuaztqry3YrJd905gpzlwwaHn8WGJdPnQKY+quiwR6tDsucZzlUgJ1eQ== X-Received: by 2002:ac2:4db1:0:b0:4f1:3d7d:409e with SMTP id h17-20020ac24db1000000b004f13d7d409emr4398525lfe.0.1686574391047; Mon, 12 Jun 2023 05:53:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m7-20020a7bca47000000b003f80b96097esm8717495wml.31.2023.06.12.05.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:10 -0700 (PDT) Message-Id: <807b8201d145a21c629797067cee21d1d1b9a0d4.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:47 +0000 Subject: [PATCH v2 19/25] completion: complete --patch-with-raw Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a69421cd740..c0d2678d320 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1741,7 +1741,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies --find-object --find-renames - --no-relative --relative + --no-relative --relative --patch-with-raw --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Mon Jun 12 12:52:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30729C7EE25 for ; Mon, 12 Jun 2023 12:54:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236417AbjFLMyb (ORCPT ); Mon, 12 Jun 2023 08:54:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235962AbjFLMxV (ORCPT ); Mon, 12 Jun 2023 08:53:21 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93D771980 for ; Mon, 12 Jun 2023 05:53:13 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f7f6341bf9so43092375e9.1 for ; Mon, 12 Jun 2023 05:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574392; x=1689166392; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=TDvxqnfpWYnoIzV5Z9Y90KCQwDVlVuLP1sO5xxzYWXU=; b=brrEgOSOa/esz91LrTaQXisuoKVh7qDg34oOmThREfWoWgoEscCRHtO/ARn0biIbxx W6k1NFFvT11oDRj00lQ73OONcBuR+0P7j9A0EvJzpyNcKG+T3o6l0qHwQrpECN+Bc0II Olu6XWp8u1xiCpul8iZc1FVwIYfzjdp11Fy0HTLbEBXKrNKM24RyL8GuGAbzGcbuSqHe 1EWu/L1qBNZ8jzq5RXlQEgH7mH0HP27cUPVhj9mDnvQdajBPBwrOFpQghw1V+X+UL+Eg zDKZJHxwCkDkhOjzkKmPPHGquwBYBhAzlSSBQW+uOV/ScyfZ3KQpC0eZGi8TC+rs0XET 3USQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574392; x=1689166392; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TDvxqnfpWYnoIzV5Z9Y90KCQwDVlVuLP1sO5xxzYWXU=; b=eyfOwgm7Xw/AX5uU10qGgPbPq2RqQQ63rnAmgqu4zRGCWMATOsjl8Ogrnm0pGimW4u iQjJc2WynJWCNO12SXdGvS3yiEY+jJAiuAVcJ8Px/4EtAt5gRWWo824pKjpz9A64zfq0 r0TWw4jTQUwHA6QRMGIH0MC0/zYI3u2dIahfdBlJENCcZz2QL4k0V4E3JkpYDZidhlJ1 lOpYJRsH6J15QB/0x9iYzBKPyMLnFRY9Ohd47+RLV+ZEEyqfJOLTg65MS95MbPg+OvPC 8Hy7mwe6PZPW1Z5a3jEgcQ8TtQWs+nKf/ujKi7CxpBy9YIsKfGWwVFUGA06ggc3BIzGF nqMA== X-Gm-Message-State: AC+VfDz6j5NEJBaJwxuBY/ArlwdThi/2tXjLuVeslNTTYnxA8CvdP7nJ TXwM+cjXjkjzgWnFZXFTOng55DEMJjA= X-Google-Smtp-Source: ACHHUZ7IohZlc5CEIX8m84uRg75odRLD/rGk2v1OffifLvz5Qnj5ZExf5jTEuevINtGkSZcN33QHcg== X-Received: by 2002:a5d:5543:0:b0:30a:e5ba:170d with SMTP id g3-20020a5d5543000000b0030ae5ba170dmr5065369wrw.32.1686574391829; Mon, 12 Jun 2023 05:53:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a18-20020a056000101200b002c70ce264bfsm925908wrx.76.2023.06.12.05.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:11 -0700 (PDT) Message-Id: <19507b1a2109f419ba5c628c32db46f96903e166.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:48 +0000 Subject: [PATCH v2 20/25] completion: complete --unified Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c0d2678d320..230d5807860 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1745,7 +1745,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code - --quiet --ext-diff --no-ext-diff + --quiet --ext-diff --no-ext-diff --unified= --no-prefix --src-prefix= --dst-prefix= --inter-hunk-context= --function-context --patience --histogram --minimal From patchwork Mon Jun 12 12:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276484 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 054D8C7EE23 for ; Mon, 12 Jun 2023 12:54:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235726AbjFLMyd (ORCPT ); Mon, 12 Jun 2023 08:54:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235972AbjFLMxV (ORCPT ); Mon, 12 Jun 2023 08:53:21 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C8D41982 for ; Mon, 12 Jun 2023 05:53:14 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-30ae141785bso4021920f8f.3 for ; Mon, 12 Jun 2023 05:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574392; x=1689166392; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=MbrDtTjoEqA3u0q9ubX/UT1d0EZ/dvmiutFWXqSihBI=; b=AUrsiIYtikYhb/tuiwRS0HDQstPKlWvWolyjIhM7WKQWFYymAr1P+aSlbU8u41oudz DzVPDMRIHblZiC4A0oPoL1lssFccTg4l2YK47lnXeuY1KjqYyKCTO7jNRY3zJHOhxWXn hpQswxWkX/sHA2B+C9fpLjLEOq8t6KT7VBwWTBiPgS9owiBNr3cjfhVnRo72NKDXqHRv KPuHnkC/CVCVZIuE40py7N84SOx3IJaM398TW3RXhIoUDPz3rZQReDFOfl3higugkH2W vGoXkWUVVMoSLT/kzEZw2gfln/uiLJ1XvVIT7f8fwiOnWcg/YLyf2oLjPmDhujWc6G/9 1j2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574392; x=1689166392; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MbrDtTjoEqA3u0q9ubX/UT1d0EZ/dvmiutFWXqSihBI=; b=IMUwG93apUTpyhG40o1hayk5qWqifICR7lDE/lhFg5+/8hIrEkFinG2HstRWIPApUa 9m0RfkqAOPv6ykRfVhQOwMFS8KzTPbBB7+lkGEnp221dRmsjiDpzNyM5QWgrzH8shZIa 3hUoMJ49gv8zNGX4JN1DoAkzTmHYWMRZfpYSqIogqm11e91mEN/DWSw9UCv1hCaOs/2U 2QEFFjv9PhjNoXznU/okE716F+D55j1TSJZZYSz0i1mkuyF+eUbnZ00bHzofkTXBH2lV fkIuU2Bm3QSzj7o5Iu+Drh/zf2JBBFMN0YQ08F5Y8nkQxdsFCBqWW8buORrySdeuTg95 qzoQ== X-Gm-Message-State: AC+VfDxv/r+0+iol8oCsY+e566G0KsUI4B+V1dKukkDgBeiMWrmKS5tx 8DZW6s8f8sJhjzJFoq4+0oCh0V6y2lQ= X-Google-Smtp-Source: ACHHUZ7MZtThMbnYncT0OVG4VRIiLPXmBHhbBHuPn6ml0cmgx7Dp+8pDMpnQYYOEBIkOv+IZ5bo6XQ== X-Received: by 2002:a5d:5084:0:b0:30f:c601:4e0b with SMTP id a4-20020a5d5084000000b0030fc6014e0bmr1161638wrt.42.1686574392614; Mon, 12 Jun 2023 05:53:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v4-20020a5d6784000000b0030fbf253c82sm3981313wru.104.2023.06.12.05.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:12 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:49 +0000 Subject: [PATCH v2 21/25] completion: complete --ws-error-highlight Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add --ws-error-highlight= to the list in __git_diff_common_options, and add the accepted values in a new list __git_ws_error_highlight_opts. Use __git_ws_error_highlight_opts in _git_diff, _git_log and _git_show to offer the accepted values. As noted in fd0bc17557 (completion: add diff --color-moved[-ws], 2020-02-21), there is no easy way to offer completion for several comma-separated values, so this is limited to completing a single value. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 230d5807860..93522558a98 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1733,6 +1733,8 @@ __git_color_moved_opts="no default plain blocks zebra dimmed-zebra" __git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change ignore-all-space allow-indentation-change" +__git_ws_error_highlight_opts="context old new all default" + # Options for the diff machinery (diff, log, show, stash, range-diff, ...) __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color @@ -1790,6 +1792,10 @@ _git_diff () __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}" return ;; + --ws-error-highlight=*) + __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" + return + ;; --*) __gitcomp "$__git_diff_difftool_options" return @@ -2080,6 +2086,10 @@ _git_log () __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}" return ;; + --ws-error-highlight=*) + __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" + return + ;; --no-walk=*) __gitcomp "sorted unsorted" "" "${cur##--no-walk=}" return @@ -3000,6 +3010,10 @@ _git_show () __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}" return ;; + --ws-error-highlight=*) + __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" + return + ;; --*) __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit --oneline --show-signature From patchwork Mon Jun 12 12:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D805C7EE2E for ; Mon, 12 Jun 2023 12:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236433AbjFLMyf (ORCPT ); Mon, 12 Jun 2023 08:54:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235997AbjFLMxV (ORCPT ); Mon, 12 Jun 2023 08:53:21 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BE761984 for ; Mon, 12 Jun 2023 05:53:15 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f6da07feb2so43205615e9.0 for ; Mon, 12 Jun 2023 05:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574393; x=1689166393; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=f5BkXreb400WVeOfBVlIPrRt2tE9+3uwExECt0YY96k=; b=bE7BTFbcgiG4HidyhaDYYrecfY8aLrZnWFxWsHeWhibpX/ZVSGCp9lQ51iKl8IM+i1 J8ktWNRif7Nz5PVG/WfOHxvWcU05dTcURd1752LcPFl2LOIZ0YZX1PFiebNlg4i8BUnH pReQSXfkKD0AYqJYggusaEJJDDM/KS/hAVE24J/oEHZ20yXQElghhStfe2gbP2wMDDUU igEB1OD1vJBJrosnNTcj+NGzAL5JUqgq8vkscUBfuI3shhNcwkTvDj3jRG6yI8P+1C3O 0uQ6+aJ9GZOPubnh3IpIEqpzELc5dTR0Y0QXNm9csK92I5ZraX6xXGv0AV9MTWTGHlxM cYkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574393; x=1689166393; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f5BkXreb400WVeOfBVlIPrRt2tE9+3uwExECt0YY96k=; b=drfI1thEd5g6HjPu83Eve/0pYKcj+/tmyJpCUDmSWIYeyCOrI8568Ewh6NIAZnfz2U UldVvctCQvMSvgVA7lafQuVtGjeIckRtwdeTMKqI1/XCB2O1hEmwIRJt96vvESttF0Aq mzX1KX8shFVI2gOClsO19sjobH8nyjnJV1pjunZWvtfiQeUOQw3ZhMyfcIW4N4PZZH5L Hm+0bZayasYHIqeXWKogTRziT/GT/3+feN6usezC+NTgavTEc636cNECPRJyN5FKmiG8 H3t+uYPn+W1uH1sILvrv57lh03Rq/GWGHj+UPqMcU2osDva4eHVq1US3JUqHClIVwJ7Q L/WQ== X-Gm-Message-State: AC+VfDyBphCpDGeBPi9OLcBePw7ZYSrFgo7vXrPPiKyWRy34AV4DvYCx mS7RFH673Ev6wdZLVTMKBH/wL1hyM3A= X-Google-Smtp-Source: ACHHUZ7KeGIzPYE93JiQEUae0T/dKK4f/8hKgHLxBHxTZmTiMZwuSwiAsav4CblSNnJZIDAzQwi8pQ== X-Received: by 2002:a7b:ca55:0:b0:3f8:1b4b:bd13 with SMTP id m21-20020a7bca55000000b003f81b4bbd13mr1972745wml.20.1686574393336; Mon, 12 Jun 2023 05:53:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t12-20020adfe10c000000b00307acec258esm12365221wrz.3.2023.06.12.05.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:12 -0700 (PDT) Message-Id: <040248a386899a611f7c10243a808624b53f290f.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:50 +0000 Subject: [PATCH v2 22/25] completion: move --pickaxe-{all,regex} to __git_diff_common_options Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain The options --pickaxe-all and --pickaxe-regex are listed in __git_diff_difftool_options and repeated in _git_log. Move them to __git_diff_common_options instead, which makes them available automatically in the completion of other commands referencing this variable. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 93522558a98..8dd54fd3ae0 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1763,10 +1763,12 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --irreversible-delete --line-prefix --no-stat --output= --output-indicator-context= --output-indicator-new= --output-indicator-old= + --ws-error-highlight= + --pickaxe-all --pickaxe-regex " # Options for diff/difftool -__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex +__git_diff_difftool_options="--cached --staged --base --ours --theirs --no-index --merge-base --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options" @@ -2115,7 +2117,6 @@ _git_log () --expand-tabs --expand-tabs= --no-expand-tabs $merge $__git_diff_common_options - --pickaxe-all --pickaxe-regex " return ;; From patchwork Mon Jun 12 12:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276486 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFBACC7EE23 for ; Mon, 12 Jun 2023 12:54:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236436AbjFLMyh (ORCPT ); Mon, 12 Jun 2023 08:54:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230467AbjFLMxV (ORCPT ); Mon, 12 Jun 2023 08:53:21 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1241C7 for ; Mon, 12 Jun 2023 05:53:15 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-30aeee7c8a0so3136301f8f.1 for ; Mon, 12 Jun 2023 05:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574394; x=1689166394; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eTV/QGooK/Fs8DIMFzZgdolL5AI/0j0Y2a2G2WOtxQw=; b=SR4X5Wd+r5c7DISfBhofHK/PTieCBBbcCRvaT2/O1hWeagq6wrKqnv3BvdTCSaTSKQ +YM2jB8Ev3RSbAHGi77IhEqLqXWfy8HTHVxXRPLS+wvVnPsIU+dfazpptJruSFfdJRpG VMBQm1/O95awK5sczYhJpag8WX6QZ2buWZmaw9bYFoqg56wZcjaxrLnCFNnH4JIGsOMX FN1PrDUkci86mgGid51nE/hr6pyFBsIEpO8Lh5GpNlmTpi3hzgQj2lwDO7qWRHjR6Uk8 M/Xlk8dybIN0yhU3cpIbHOQ1JfYM0BSB1WLz31lS1+8KAJcIhD0KA9HGGCW7aHOEQtoT X3Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574394; x=1689166394; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eTV/QGooK/Fs8DIMFzZgdolL5AI/0j0Y2a2G2WOtxQw=; b=iQuynNsKD5ijnmiOWDtrI3mvyy8g42CTqaquaWRhsftwUJDDf/Y96bsSqerM2CNe5z HEG7efFqyKOCCVJKpkWBlY8g653AT/05VyGtt+09EW9rKQoZ2WOajbZLwyAE2QbQKi08 I9NjocBjxRjXi9oKwM3fnKLsDKchW0NfcCpAnVh1VaXI9Cm1HQV38oRFMGF6eoNS9LJ+ ulSY69bwg+j8pT88XQjSTLi7Gb+oJ1Iu23/FGxQVo1OcRswpDdsFv9oz4leVuJhLPjUB jm2A5YSUJXrTsm33JRPUgXo6vXLqr8eox+wiTqNS+VDJ20jQdGfsRn/R9YTbROSubxfs C2oQ== X-Gm-Message-State: AC+VfDzBJrPccRt97HRmAdy7JgIPq1rdwaidPIKKIJmg1c8dVaCD6SU6 BqQbHA7834pTFF3X5FyBexvG+7qDhW4= X-Google-Smtp-Source: ACHHUZ6sf/N3hjH1ravuy4NaYokhw3f9PQcZ3FIP0iQbq6ZyQiT1x1YtW9fAXWyuacFV3Okjc/2L1w== X-Received: by 2002:a5d:68c1:0:b0:30f:b950:4a5f with SMTP id p1-20020a5d68c1000000b0030fb9504a5fmr4131605wrw.13.1686574394086; Mon, 12 Jun 2023 05:53:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y17-20020adfee11000000b0030af05fce4dsm12494649wrn.77.2023.06.12.05.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:13 -0700 (PDT) Message-Id: <808e7db20cf92991ac4c61355bd4b22bcdeefd3f.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:51 +0000 Subject: [PATCH v2 23/25] completion: complete --diff-merges, its options and --no-diff-merges Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain The flags --[no-]diff-merges only make sense for 'git log' and 'git show', so add a new variable __git_log_show_options for options only relevant to these two commands, and add them there. Also add __git_diff_merges_opts and list the accepted values for --diff-merges, and use it in _git_log and _git_show. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8dd54fd3ae0..7b7f3f838e0 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2040,6 +2040,12 @@ __git_log_shortlog_options=" --author= --committer= --grep= --all-match --invert-grep " +# Options accepted by log and show +__git_log_show_options=" + --diff-merges --diff-merges= --no-diff-merges +" + +__git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r" __git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd" __git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:" @@ -2096,11 +2102,16 @@ _git_log () __gitcomp "sorted unsorted" "" "${cur##--no-walk=}" return ;; + --diff-merges=*) + __gitcomp "$__git_diff_merges_opts" "" "${cur##--diff-merges=}" + return + ;; --*) __gitcomp " $__git_log_common_options $__git_log_shortlog_options $__git_log_gitk_options + $__git_log_show_options --root --topo-order --date-order --reverse --follow --full-diff --abbrev-commit --no-abbrev-commit --abbrev= @@ -3015,10 +3026,15 @@ _git_show () __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" return ;; + --diff-merges=*) + __gitcomp "$__git_diff_merges_opts" "" "${cur##--diff-merges=}" + return + ;; --*) __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit --oneline --show-signature --expand-tabs --expand-tabs= --no-expand-tabs + $__git_log_show_options $__git_diff_common_options " return From patchwork Mon Jun 12 12:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E8C1C7EE2E for ; Mon, 12 Jun 2023 12:54:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236108AbjFLMyi (ORCPT ); Mon, 12 Jun 2023 08:54:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236013AbjFLMxV (ORCPT ); Mon, 12 Jun 2023 08:53:21 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81AB910D4 for ; Mon, 12 Jun 2023 05:53:16 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-30ae95c4e75so4242619f8f.2 for ; Mon, 12 Jun 2023 05:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574395; x=1689166395; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=bBjVsTfHC97mrXrTf7OOMY/gBC1f5uYUeDEimD9hNGU=; b=l9VjLlPLGEYl3x5Y2CbCbh7g4Z/QPqPO0njF9goXPt5zTDCn86lobZHNOaNIGzsTN7 UfvjyeUslY4OtL8ArdsMsE6+Cj3BJEjgiJptFNLUli80YEraQzrKTKW6Ys/XnqD/FD/t ZsM2q+Ri3ex6dA8HTp5qvh0bpID8pTWKpQnHsWHLnqbPpQP1xLsODXJgtV4SaaXj1502 GUze+rdSEwyDqK9rAmrpEeFix3fbdcaJhg8D/U1byNqLK+hRbj/Yv2fsjTI7lVjkJVAH PY3qDFg0F+Lr2fxmgh/Cnh92aXEvVDJ9+iSwL/z1myVBkmO7Vc634V0DdU2pvhQ8TwdL 5l9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574395; x=1689166395; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bBjVsTfHC97mrXrTf7OOMY/gBC1f5uYUeDEimD9hNGU=; b=glmc1Zy3OVwFHZGifcktiPUqz/yDVXZihfvHoSuqx47dmiTbo8W8AdbC8NWQqw3HVJ 1EBDSONbHVv2xWKiIzI9DSBV1USsYTelEdcP0aRIqDtcjDanfSt7eBB780qajLHt6KsN zV2/qJ/k+f0VLv2+bNN36TmVbIOBrTszuif4fDQJbvV/iAvyornh45uvWLPmXlL0SpdY jlxnL+9KdcEupsd26rxm1zm4zLXtQM42q/P9mmYnL0SW9Nyr91BbJuBQrIiF6+8nRKHK UBAJmKTz2vmv6+WwiAiAKFwYnhdyDXJAu7vnFHoeMYMoEpn93FqmtF2a1GcgQMxgbh/o WGXQ== X-Gm-Message-State: AC+VfDwhy0oZgdiCfL/qZz56Zalc9zBRqJ1MgYMWYMYEQEOq8nN/ePPC whIsaGWRNLeU1MKW3SWcVqr8SEl/Ivo= X-Google-Smtp-Source: ACHHUZ5N5Sp2Aacg4lYHCqQk4B+EFchvNINgg6Zd+F0x4RAMpLlM0SdjRPKD6Pq2xYJu/OGxPoTq1A== X-Received: by 2002:a05:6000:184:b0:309:4358:5afd with SMTP id p4-20020a056000018400b0030943585afdmr4293675wrx.54.1686574394768; Mon, 12 Jun 2023 05:53:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q3-20020adff503000000b002ca864b807csm12466391wro.0.2023.06.12.05.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:14 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:52 +0000 Subject: [PATCH v2 24/25] completion: complete --remerge-diff Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain --remerge-diff only makes sense for 'git log' and 'git show', so add it to __git_log_show_options which is referenced in the completion for these two commands. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 7b7f3f838e0..38b6bac9154 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2042,7 +2042,7 @@ __git_log_shortlog_options=" " # Options accepted by log and show __git_log_show_options=" - --diff-merges --diff-merges= --no-diff-merges + --diff-merges --diff-merges= --no-diff-merges --remerge-diff " __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r" From patchwork Mon Jun 12 12:52:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13276488 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B828C7EE25 for ; Mon, 12 Jun 2023 12:54:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236457AbjFLMyk (ORCPT ); Mon, 12 Jun 2023 08:54:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236058AbjFLMx1 (ORCPT ); Mon, 12 Jun 2023 08:53:27 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7557810E0 for ; Mon, 12 Jun 2023 05:53:17 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-307d20548adso2919467f8f.0 for ; Mon, 12 Jun 2023 05:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686574396; x=1689166396; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=c24uSQ9nKgDHUqXbXwvgV+/kOTkn9VdgClatDZCr/fs=; b=Qun4rw/N9WXDjwRq+j1Ak/Xtddvx8Tm2DnIc9/W61QyKozxo/nGpPmvKiT1QMWDmPd OJi1Mz3z0M40N3h5UpWkYF7wtQz9vBJ1HPFmFxFyQ6pOG7GuSN98mZz1Sva+It7zovXc NNm8qqGX52CBpBQ5RkM2q9k64QvOtheEr7oehuZRMkO7xC5/NGwg+da3WGlanmlF6ffV jjK6i4Ui07cfiNTVLIJLEeUj1ZcVpr9X4av/x/VDJAH31JTzZy8/k0058p2RUadE4Hct Q5DJy6pSppabTYWU+TzPy018InbbuJx6PvGgkgp/vGiWyY5w07ix4mHscIQqwsU45m+T 0oQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686574396; x=1689166396; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c24uSQ9nKgDHUqXbXwvgV+/kOTkn9VdgClatDZCr/fs=; b=Dg1TujdmO5afaXiklXpMwwVvwpy61DoKZ5CxWYZ9TRu5A/ohJ6P76wVGpQmyntJZit YDkqF4YQ/XEp7R/L14/XkIa7TUVM+3Ia/pTA4CzhBHhk/OY+m39vy6E4/4Zqv72psFbd hElYaJYPxvKgPRVHYYI2HRaRykTIMLhq1mAzaivsZ6BAYPgoZNztqJBAx+Q/Dqweij20 knDHZd4aX16VCC+xhuibm+uEpLfNFBEH26YzJXSwnBDwb12IEKefqeYR5E/i2m08T246 Pb1iF6E7PBT2DzB/XfYPHAc9GiWWTWfeEl7j0YY1yBSD0FFl/pxL7ob4q1rdTkUoiOMa ba1g== X-Gm-Message-State: AC+VfDyCcmOz7VPiMban/CHqn6qfLp8IHzTJHQiwqaQIAXwoyu7/O9hQ skIpABe7CataWaB4BnbAM42GO2T69y4= X-Google-Smtp-Source: ACHHUZ5nd0X/ittpf5dp++14rDXSwNJcaerKKtRDXgpg8fnxn2F8FpxzvaBQZQj/td5FX7W4mOD2Vg== X-Received: by 2002:a5d:5088:0:b0:30e:3d53:7e5b with SMTP id a8-20020a5d5088000000b0030e3d537e5bmr4704876wrt.57.1686574395700; Mon, 12 Jun 2023 05:53:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s3-20020adfdb03000000b003047dc162f7sm12457070wri.67.2023.06.12.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:53:15 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Jun 2023 12:52:53 +0000 Subject: [PATCH v2 25/25] diff.c: mention completion above add_diff_options Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add a comment on top of add_diff_options, where common diff options are listed, mentioning __git_diff_common_options in the completion script, in the hope that contributors update it when they add new diff flags. Signed-off-by: Philippe Blain --- diff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/diff.c b/diff.c index 3c88c37908d..64c93c0f0e2 100644 --- a/diff.c +++ b/diff.c @@ -5491,6 +5491,10 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns return 0; } +/* + * Consider adding new flags to __git_diff_common_options + * in contrib/completion/git-completion.bash + */ struct option *add_diff_options(const struct option *opts, struct diff_options *options) {