From patchwork Fri Jun 25 19:38:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 12345781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC2C5C48BC2 for ; Fri, 25 Jun 2021 19:39:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D61D61952 for ; Fri, 25 Jun 2021 19:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229878AbhFYTlU (ORCPT ); Fri, 25 Jun 2021 15:41:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbhFYTlU (ORCPT ); Fri, 25 Jun 2021 15:41:20 -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 1B6C4C061574 for ; Fri, 25 Jun 2021 12:38:58 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id r3so2422009wmq.1 for ; Fri, 25 Jun 2021 12:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sZMAMY9NPSw0SP4dVqJDxVCiTBB512OE+MbS6KYJzs4=; b=GeHTp23ECCu4+VWdU2pjUilZ7erlta0o+Yt4rCFM2ArlqcpYhDGdcKyMed/iogAm9S XwNHUacF882W9mUxif6YvX67F/uGgHuHUxNWlUndBeHtxtLfwEJ/7QF0vxH0ajvDTvHo KRHlI2QCOM37TgnyvnRqwViDcBKvvpl157e4u78uTK3P8iKcnRIxWlWPMtmg0r5ibK4X R0zkniA8IpyfXgCVLsxYqM8SUklP5zzGImaJwhFCw6pUffVI9Y5nBu5QstzH7xyItCyU d7Fensxk/1W78Ftf3vbxfcgjF3HJ58EhVoun8aWub61T60CmrX8UaugMwjiKkWM2M3kS lpIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sZMAMY9NPSw0SP4dVqJDxVCiTBB512OE+MbS6KYJzs4=; b=Ch4Q0K+fIxgESIyg1dZBAcZlM684LeKDWDZHCJJxU2U5NcItoRiu+UqgWH/LygMJ2X KaSyUgF8lI2clJ1AsMfBQFsEwK3lidRctkGpp2dGxXeVSKHygIxJ7rTAmFZKqZrQTyVo O+j9GlzH+roCSnokejRxaDcAExVpCq5V0pxJpGWEbaK5ntyj3t5MRu2S9nsWJx5M4na2 dXVXmXYZgwRWkAizBFe4PKBMIDsgFjFVTrE+WTbbiqqF2blxFrgZvbxFioXacXhh75qO 6ihRAvFlcxC5TvBB0rxM/hs71BiXoOLvsIvxlIGqtBYqttyDP/nVBteTELrbunhKzaUX OILw== X-Gm-Message-State: AOAM531APmICfY1kvA7CvHulrUhdlMZxyUkvfRBvEHg8MPZLMK1k9VF1 92OBsAmsgRQxLX5OT23Z4HBo2Jbh+GSQQsu1tUMxxQ== X-Google-Smtp-Source: ABdhPJwEm+7OGOiP+u+hn0zNsV3yex/A18oFctene/E+Hzq1O+JenQmnSct3aOZM5j2w1X+YxumKwQ== X-Received: by 2002:a7b:c5d2:: with SMTP id n18mr12529809wmk.97.1624649936527; Fri, 25 Jun 2021 12:38:56 -0700 (PDT) Received: from localhost.localdomain ([46.246.3.237]) by smtp.gmail.com with ESMTPSA id c18sm6679233wrt.83.2021.06.25.12.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 12:38:56 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org, Bagas Sanjaya , Barret Rhoden , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Rafael Silva Subject: [PATCH v3 1/3] blame: correct name of config option in docs Date: Fri, 25 Jun 2021 21:38:49 +0200 Message-Id: <20210625193851.2233114-2-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625193851.2233114-1-rybak.a.v@gmail.com> References: <20210619112912.76136-1-rybak.a.v@gmail.com> <20210625193851.2233114-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As can be seen in files "Documentation/blame-options.txt" and "builtin/blame.c", the name of this configuration option is "blame.markUnblamableLines". Signed-off-by: Andrei Rybak Reviewed-by: Bagas Sanjaya --- Documentation/config/blame.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt index 9468e8599c..4d047c1790 100644 --- a/Documentation/config/blame.txt +++ b/Documentation/config/blame.txt @@ -27,7 +27,7 @@ blame.ignoreRevsFile:: file names will reset the list of ignored revisions. This option will be handled before the command line option `--ignore-revs-file`. -blame.markUnblamables:: +blame.markUnblamableLines:: Mark lines that were changed by an ignored revision that we could not attribute to another commit with a '*' in the output of linkgit:git-blame[1]. From patchwork Fri Jun 25 19:38:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 12345783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B784FC2B9F4 for ; Fri, 25 Jun 2021 19:39:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A04F9613B9 for ; Fri, 25 Jun 2021 19:39:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbhFYTlX (ORCPT ); Fri, 25 Jun 2021 15:41:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbhFYTlV (ORCPT ); Fri, 25 Jun 2021 15:41:21 -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 552A6C061766 for ; Fri, 25 Jun 2021 12:38:59 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id p10-20020a05600c430ab02901df57d735f7so9130772wme.3 for ; Fri, 25 Jun 2021 12:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jJJv8XPBnB4iAefA38zBY1cHB5c4qwK5KNumc6jHwz8=; b=emO48+Gtglmf8VV5hvB927eFNYD1IU5WFZwA1FjtrixJewCA+SmzWBPiFzumce1vdh CR5q2phZexErxwp2OL+mmQei/2/tZf8a75xM3ALc+aLPJzUctmyigHwh204E9oonS6qA isDr49AkbgFmbuaTjVUuDlvZSe3mkboPLMiFTJ6SiV/7H2125eAniAqfd/pbaPmZML1m kxa5Ct7/bf+HMprpjUWdPiAMBYD5RJCIQBR/0xRB5/L4BbkzREF+2Qi9lH8LYWJqGUhc kUkhW+U98w8kii1KHbrgXkjG3VZiHhNUtQI2DB/dABJhXZq19UPqVgtQMiwMqb0/DXdT 6e5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jJJv8XPBnB4iAefA38zBY1cHB5c4qwK5KNumc6jHwz8=; b=Nrzzfg+ZP6IIYYz4lRBtXrdS0gcPl9UARsh7dURLA6rzsmPPxNsj366W6hvyefspaN LKnkWfxrTWZCvXdjvWzuzQ4/BXRzmbloHzlJRElpdSy/De0g+DhlSzhp4CcEgX3jjZUS tSHRbh6tS5FY3HBVeGQRN+6U+ErIGSYRk3mFuHKaT5QGiDpBKeVpuCPdYZIREk1LfOuN MAYkW2h+SknPYisMTErrsl7kM+gkMqz1Ig1BS5ivmugmU2PXDBtg8i8NizyVs8mpN5KF 2dJJdzudx6ZXfF7Ff8iyCGq5siw+r8pBieCzTWyLVzgK2mOaNZlbqVfS5Hqxm34N9koa XWRA== X-Gm-Message-State: AOAM531n5G5Pr0PuGFTlQQT+dLBoTXotSmnvGaDPwgFccXLSaJhSYAl8 9YIiJLs0Cei2y3nY4JeIXZS7WmKgK20pM3V5o1cjCQ== X-Google-Smtp-Source: ABdhPJxKM2Alg63vyhHlCU068ysd6+jsnT+w2hHGvcynOuuwGYZN34L8rnnPY4Jx1KxBDM0GIykK/w== X-Received: by 2002:a1c:f60f:: with SMTP id w15mr12538479wmc.71.1624649937542; Fri, 25 Jun 2021 12:38:57 -0700 (PDT) Received: from localhost.localdomain ([46.246.3.237]) by smtp.gmail.com with ESMTPSA id c18sm6679233wrt.83.2021.06.25.12.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 12:38:57 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org, Bagas Sanjaya , Barret Rhoden , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Rafael Silva Subject: [PATCH v3 2/3] t: fix typos in test messages Date: Fri, 25 Jun 2021 21:38:50 +0200 Message-Id: <20210625193851.2233114-3-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625193851.2233114-1-rybak.a.v@gmail.com> References: <20210619112912.76136-1-rybak.a.v@gmail.com> <20210625193851.2233114-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Both in t4258 and in t9001, the code of the tests following shows the proper name for the configuration variables. So use the correct names in the test messages as well. Signed-off-by: Andrei Rybak --- t/t4258-am-quoted-cr.sh | 2 +- t/t9001-send-email.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4258-am-quoted-cr.sh b/t/t4258-am-quoted-cr.sh index fb5071f914..201915b45a 100755 --- a/t/t4258-am-quoted-cr.sh +++ b/t/t4258-am-quoted-cr.sh @@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' ' git diff --exit-code HEAD two ' -test_expect_success 'am with config mailinfo.quotecr=strip' ' +test_expect_success 'am with config mailinfo.quotedCr=strip' ' test_might_fail git am --abort && git reset --hard one && test_config mailinfo.quotedCr strip && diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index c66d9190de..9ec7d75f0f 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1839,7 +1839,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' ' grep "^!somebody@example\.org!$" commandline1 ' -test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' ' +test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' ' clean_fake_sendmail && echo "alias sbd someone@example.org" >"$HOME/.mailrc" && git config --replace-all sendemail.aliasesfile "~/.mailrc" && From patchwork Fri Jun 25 19:38:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 12345785 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D031BC2B9F4 for ; Fri, 25 Jun 2021 19:39:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AEB1C61954 for ; Fri, 25 Jun 2021 19:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229934AbhFYTlY (ORCPT ); Fri, 25 Jun 2021 15:41:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbhFYTlW (ORCPT ); Fri, 25 Jun 2021 15:41:22 -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 38714C061574 for ; Fri, 25 Jun 2021 12:39:00 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso6442254wmj.4 for ; Fri, 25 Jun 2021 12:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ODOJTCqvmjw5DOl/mCrJ/Kf9rV4lcUS1rXQTTqifZa0=; b=m+NTEPl/Msh+LoyZoHg1WzuLHU5wKLBEmuC4EZOwx1iIPN/nC/Vl2s3hJdIi6cUH/+ d28CXjNRcv4y1oJq3Z4nh6lrpU5fbVOgcPzsCzx194q+hO96w8b1XsKQ783s2cAcyRP/ 2PBoI930O0fuImvA/EyUTSOuUK/nNos6LZX9/w7pu3IIJpLHz5e5tqQhlGOt0BAl8I1e xsa/TBTJDXgfC3wMpiGsxKq8SOCy6DCCJAqv6VRfkG6updWKCf51jJ5nnfa5abxlUVvo yA85Y5B73cMnTr2PNFZoEFo4K0GFkoKXAHzHvgW9rLEKyIozynwyNFEcGhgOXtCTupnm vq+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ODOJTCqvmjw5DOl/mCrJ/Kf9rV4lcUS1rXQTTqifZa0=; b=oTvUxeWSxkrn3QzfJw+lB5zfIgayvbagWu8poHMBIfUMjWw1+/gCo26ZMuHYE5qymI vNJ6JcU+LHa0y7VhHnPCOVOdu4QW77n6AQyqrfy7OvUzRMD8Yc08pGVuhJPW9MOdhtMB ozGipcMgqtR7PhuI+3W9ZyEops19rJUgN4Si/PoUH+NXNCDBKOsEWql+CXbxGoON851k DiuWZ65JXPE24kkhAjG/793nmZaF4cBJRfNM5ZNchopKdyNyNKJJ3l/JjQMSzektZFPA sWxiKrsQc4jLWl0vvEI3XU/Rcmlb2tGpH7Uewnf/7lBnJopTu0/Pbrmp3vQ80LD7DgQf tbTQ== X-Gm-Message-State: AOAM532RtVmATrHs9EKU2EFii582k9BtQ14C7tgHAzjtRkyqzOY/0cx6 3EjQAG7tiZL1Q7uaVLT6X6JJw7vmyQfcn/OPVsWANw== X-Google-Smtp-Source: ABdhPJypkmmuw9yGxG+E8ERVIjiNV2q2r6ZwwqmaJqqYg0XxLrHKXn+Z9sFeVcn82fpXMrXiGa0pMQ== X-Received: by 2002:a7b:c104:: with SMTP id w4mr12537578wmi.87.1624649938603; Fri, 25 Jun 2021 12:38:58 -0700 (PDT) Received: from localhost.localdomain ([46.246.3.237]) by smtp.gmail.com with ESMTPSA id c18sm6679233wrt.83.2021.06.25.12.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 12:38:58 -0700 (PDT) From: Andrei Rybak To: git@vger.kernel.org, Bagas Sanjaya , Barret Rhoden , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Rafael Silva Subject: [PATCH v3 3/3] git-worktree.txt: fix typo in example path Date: Fri, 25 Jun 2021 21:38:51 +0200 Message-Id: <20210625193851.2233114-4-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625193851.2233114-1-rybak.a.v@gmail.com> References: <20210619112912.76136-1-rybak.a.v@gmail.com> <20210625193851.2233114-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Andrei Rybak Signed-off-by: Carlo Marcelo Arenas Belón --- Documentation/git-worktree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index f1bb1fa5f5..66e67e6cbf 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -387,7 +387,7 @@ These annotations are: ------------ $ git worktree list /path/to/linked-worktree abcd1234 [master] -/path/to/locked-worktreee acbd5678 (brancha) locked +/path/to/locked-worktree acbd5678 (brancha) locked /path/to/prunable-worktree 5678abc (detached HEAD) prunable ------------