From patchwork Mon May 8 17:27:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234777 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 0FF3BC77B7F for ; Mon, 8 May 2023 17:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233557AbjEHR16 (ORCPT ); Mon, 8 May 2023 13:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbjEHR1z (ORCPT ); Mon, 8 May 2023 13:27:55 -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 CD1345FCC for ; Mon, 8 May 2023 10:27:53 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f41d087b3bso22879395e9.0 for ; Mon, 08 May 2023 10:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566872; x=1686158872; 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=6Jqn/9IBQlxbkcFDFbbYMKi20gslE2mM16gToC7N0F0=; b=N7u1ANPi8O3s4sD8iqicPUlalStoG36MMAaDM95N5mS1R/E2mwZPtiHWlps+90SzWW +57/1RZvssWV63vPrMWyCQzZGIABcoXy4AwKi1pLhGe+ysygC7XIf5RFdN6sfeRL6kpJ g2Q+1mguuKuAnvZnHzhuagop5o89oyFyIhHCt8XI4/GHTYIfg78E7rJ1nuEOAAZ1e4/j us8LYYF8APKjyQtlN50gCqgORdSdt6s4EAsvEOuJQDL8tWBdsm+omFp8qaldgn4SQYFH jJKvjbNTt1/sOVrDHCzyAyyJjhUXHrCcRhTnqNWAvnHoseIu1FDW2cRBlLwJa9kYZS37 RNHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566872; x=1686158872; 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=6Jqn/9IBQlxbkcFDFbbYMKi20gslE2mM16gToC7N0F0=; b=JCpF56Lm73X5PxVKbgVTaFtWTq0G7mwqtXQIYyjAr/h6x/H0DFa371HxUxWVkNoewI RbrjdJunkjoOx+WVuNpfUbOd56YUbRrKwhmIYlwCVc77Y69nj1snURdRRM/QTN2/45tt 348xSwdoREZgIAfcxXJxgxyKVGHKDrDKi0hTh56KNmmiYmh/kixjGoki3FwE4TIUAif0 X2oQnAxvJzjdtonRjM0H0RkVBTDYx4gMxWicbyb7/B34hNWA2k6lSdIcWC2KyvIx1L2p EPxQ/xwPW+u1R9g1e+Vk11QgGVEeuJF2K0L8Rd4NZtA/6ut051Bn+u4JkVEvj3ckf1cn zlTg== X-Gm-Message-State: AC+VfDz54321jlXVnJNR5+HUssnz/HknH8oR1yVe6dTLoUwBuodGRiiG H0amgt0shjiCNwsVj+PT4vf9PJ4ntwc= X-Google-Smtp-Source: ACHHUZ4aV85TqS9FIx3RP42aDuFnwXiq7VHMD9zvp33oKxBuc1gmpGxpul0mlKLLNF4GNR8gvGnRCw== X-Received: by 2002:a05:600c:ac6:b0:3f4:2770:f7e9 with SMTP id c6-20020a05600c0ac600b003f42770f7e9mr1714949wmr.17.1683566871945; Mon, 08 May 2023 10:27:51 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a9-20020adfe5c9000000b0030632110586sm12140532wrn.3.2023.05.08.10.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:51 -0700 (PDT) Message-Id: <12d4850a9ab8659c40fcb6470caf8f98d7f6e486.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:40 +0000 Subject: [PATCH 01/11] doc: trailer: fix grammar Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 22ff3a603e0..e695977fbfa 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail +Parse or add 'trailer' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message. From patchwork Mon May 8 17:27:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234778 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 5FCB6C77B7F for ; Mon, 8 May 2023 17:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233648AbjEHR2A (ORCPT ); Mon, 8 May 2023 13:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233463AbjEHR1z (ORCPT ); Mon, 8 May 2023 13:27:55 -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 8D66E5FE1 for ; Mon, 8 May 2023 10:27:54 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f1950f569eso31899745e9.2 for ; Mon, 08 May 2023 10:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566873; x=1686158873; 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=T/gvh1lMjD+NsQr37NlxiPcoKDYyAgHQXPzj+Wx7ZrE=; b=N3A2fMwh/7n2o0CkTxFvEObZa63781RzgBzLK4BkincGpn32lEcWlE3gcAMIUVKZo6 yY9KxDpTvct6MV5C1MXKy/nDBN1rDfO9q86AAKMZDUnMJcJYfH/fRH2/MtblyDCa4YVb f+aChBL1jRwyvQ87be3FcF/wPb7iYAru9v4lXVnZmBLDta59YobFwpqsaH9S/dYn2SF9 ExAdzGb8hdbRSwTRRsZ8r49XfoU+qvtYuWFWV8+jRlrpzSSFpCD4uxkzQHKqK33KwzW0 QxNKO0c6XNCPbGJWZIh0KzbBBFeUIbwNzSUZtpMDwflaEIdEE4fQLvvdxAJRdDGfYVD8 2OEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566873; x=1686158873; 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=T/gvh1lMjD+NsQr37NlxiPcoKDYyAgHQXPzj+Wx7ZrE=; b=RWY4DJSs/sML7EmWeU1RiiWyz6fXKvlmYZ5TO338IL1Z6oQ+O/WaoLxazvoEGysS+2 pxJwws3NNrq9UK9xb4OMtlCK0OLtBMXDu961+WyhzfdkCpgcUlYCeMCgaxvVRVl/dkzS inSvf4hmAADBaq2PNuwGiSQkQ+1Xfyx0n026ZLfCnhi7pjClPEMR1M6QJ11OHVQIyoxM VPDyEabgwM1uJOFrlEkAPfckzGS8zRZv31Erox3c/ClywLcdbZKIWkCoqrsunXJhL6ow orZMgmfS8gp0LCMD3yPQ2SoEH9r+gEmw9vfd0lieYYqnz3hRWeYK1PXx7BWfgvCKge4Y xPKw== X-Gm-Message-State: AC+VfDyE7Slxz7PbUeoW1kF5O9xDSmik/FTnHSV7tv3lfAMNxRgmdz91 38CCFROcn8tSAlZcqXu5m1f0E5L7xMY= X-Google-Smtp-Source: ACHHUZ5xEQ+tAnJTabwD8eZp4W+7utgzajS1hyf/Y2BHVzXQHYEn/RYi/9/rzTcfUFxdBDB7wNCDcQ== X-Received: by 2002:a7b:c8c6:0:b0:3f4:2220:28d5 with SMTP id f6-20020a7bc8c6000000b003f4222028d5mr3998044wml.29.1683566872736; Mon, 08 May 2023 10:27:52 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z22-20020a7bc7d6000000b003f42813b315sm2081804wmk.32.2023.05.08.10.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:52 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 08 May 2023 17:27:41 +0000 Subject: [PATCH 02/11] doc: trailer: swap verb order Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver This matches the order already used in the NAME section. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index e695977fbfa..593bc1a1f4e 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Parse or add 'trailer' lines, that look similar to RFC 822 e-mail +Add or parse 'trailer' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message. From patchwork Mon May 8 17:27:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234779 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 F3E24C7EE22 for ; Mon, 8 May 2023 17:28:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233763AbjEHR2D (ORCPT ); Mon, 8 May 2023 13:28:03 -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 S233475AbjEHR14 (ORCPT ); Mon, 8 May 2023 13:27:56 -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 366B3125 for ; Mon, 8 May 2023 10:27:55 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f19a80a330so31869055e9.2 for ; Mon, 08 May 2023 10:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566873; x=1686158873; 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=gJ9IddLFLfBJHdF5fhs+lemvgsA+gHJ00ne7pVHGufg=; b=O95Us8t3X00R3EkM/Qj1C1T2eoewnEdViy7hbUi6jghQorS98K26higGaMq11GTPdr QI9d7u/qjOnjx///PiDDjaASJTc/4RB4j7nMldbA4ibhWYdK2EO5/3YaS0oG2FdODojk GQg5EoPStFQqttfrtUOw3Eg9b1aWpCZSMeIK09/tARmmNmHZPmuIlNZ1oAAvhBMGAx7w gKkzCEv+3XCF2hXhky6NlvRxESrKbk8vt+9k+LGBa2Hy1TZiShlxU8vzWc1n27P6qO7L H/WYv7v02d09kGnVR+RPOUF5teQJuuqoqR1wL+GnuOqe2m/9F37LRrWehHW6rOYE8Gdd sPYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566873; x=1686158873; 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=gJ9IddLFLfBJHdF5fhs+lemvgsA+gHJ00ne7pVHGufg=; b=bFdIdAdIgNbeZk+dmMO3Vl0w53OmN/7ppfKPeOtSscy+HF73tJbobVJtRUu9VCuEyS zyWGRj0KBzoqMN4q3SrIUokjRCTulgPwOIMFIV80I5yvoYCs/MiTu/odNHEiYPTeri44 3AHNT0bHYdIJqa5vrZ5qT87ya3RN/odoKJBDOkw0kZvxfLLr5rCg1AfUguAZrKWjdbCZ HwXrAjHl0/+cin7lHytxd0+RpehlLp4N9l39q3vU6DFUh3xbxqDYePFe98VXG/ibU7HQ GJLMSJ9BEbPRPk0ayKMCIWya1bAGhmlwy3KYTnV7G8UcZlwZVJSurbdjotJFFzNKpnbK YguQ== X-Gm-Message-State: AC+VfDxsDm4hnGonpdJz/KRFlbH3Oq2ApI40dvbX6+i6/smEDZxU58uU Vu4PWJBGPY5TpI9K/FIQJU4lkwExNUU= X-Google-Smtp-Source: ACHHUZ55+vgCCVW/xfkJYG0/7K5mTetz/pM8raz6kLQqC7KrH/aQR0WSBGNLb/uxbmRFWgJXOoTE1A== X-Received: by 2002:a5d:460c:0:b0:2f2:9198:f0f with SMTP id t12-20020a5d460c000000b002f291980f0fmr8371953wrq.10.1683566873556; Mon, 08 May 2023 10:27:53 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j17-20020a5d6051000000b002e5ff05765esm11877799wrt.73.2023.05.08.10.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:53 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 08 May 2023 17:27:42 +0000 Subject: [PATCH 03/11] doc: trailer: --no-divider: more precise language Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver This uses the phrase "commit message part" instead of "commit message". Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 593bc1a1f4e..3e60a6eaabc 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -131,7 +131,7 @@ OPTIONS --no-divider:: Do not treat `---` as the end of the commit message. Use this - when you know your input contains just the commit message itself + when you know your input contains only the commit message part (and not an email or the output of `git format-patch`). CONFIGURATION VARIABLES From patchwork Mon May 8 17:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234781 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 70E0AC7EE22 for ; Mon, 8 May 2023 17:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233654AbjEHR2G (ORCPT ); Mon, 8 May 2023 13:28:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232429AbjEHR15 (ORCPT ); Mon, 8 May 2023 13:27:57 -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 323A05BBA for ; Mon, 8 May 2023 10:27:56 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f315735514so178735475e9.1 for ; Mon, 08 May 2023 10:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566874; x=1686158874; 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=AssUO8Z9C5J3VDWNfO7V03Rki7Rts3xu6fvPb1FBxq0=; b=l4Wvl0tlKAL8EMTSXOSusSSEd8TZLBi0LACSn9OK8K39rFtrfWdA/IyYi5J5cK0Wp8 /ukmnrs/Otg1ZCPvtEcEu4mCEgzbkncc9/rSux0OlNdRe4+3Js7rvKsrYvb80G7GtzRa 4s+dqE4WNsXNaG8SevzKGaKyqb4rKXmNY3/zt8SKtytZ5mQxhMYzsifFtjyTnB7rnxMS Fdopw5awqBH18y4eVK5W3ZcLvi27cwmMSDktdDCKR9XTdQr/dsZqqGWjVFBZ1VbYyOgV 66lXjRlVdK7PbqW+KRT6YF2eDOhlW7gV7I6EyJJ64+QbLFoJWgcYEyd7zn3Tug+krat7 /TGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566874; x=1686158874; 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=AssUO8Z9C5J3VDWNfO7V03Rki7Rts3xu6fvPb1FBxq0=; b=FJJC2+GgXqp11YNp+vdHdatSF6Zd/mUCNw1ClEw06iPEDPryajmqtCefyKXIzEGZAU mfG69QHvtX8AtITaY/hK/2N5BPWQcztoB8Abs5Woeg+Gcm+3pvLhArI2x7uHzzQlClx4 7HM5+e6EM5JLFgxzo4pb7xBk1ToVKluLqUH3yWoS329t7ZPKSCB50MMVH+QHNT9A/WdD t7HTRZv8pfUgaC3vRTb+b57b4ihfey5rf4k2sEmMHxZHTw2kmpOE62pnGy3GfcddBz4m XP5BUh7KNEeaDCJggee9v+4wimjtW2GYEIfkz0b/LtYrVP4UP7G6C/CwRlYAyhey90rn vcpQ== X-Gm-Message-State: AC+VfDxOONJRBMYOW9Kt8PA6/Ly/n9BtoILCjztVKb+lSUD9MM3yDuZ3 D2/02aqA7lYww7lgNudOq7Gt4CL2XJQ= X-Google-Smtp-Source: ACHHUZ6Ul6SA4LzpacfkDgF0PMIbJXnGC4U17bbJ4BWjRYrFvNeNGwkHIBvRF0lpONR5R8xnEI3w9w== X-Received: by 2002:a7b:cb93:0:b0:3f4:2374:3511 with SMTP id m19-20020a7bcb93000000b003f423743511mr3614877wmi.10.1683566874440; Mon, 08 May 2023 10:27:54 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q4-20020a5d61c4000000b003063772a55bsm11838295wrv.61.2023.05.08.10.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:54 -0700 (PDT) Message-Id: <0c10e40794d208ba408a2b1c394fdbd6caa7a92a.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:43 +0000 Subject: [PATCH 04/11] doc: trailer: explain "commit mesage part" on first usage Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver This phrase is used for the first time here, but it's not explained what it means. So explain it just in case it's not obvious. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 3e60a6eaabc..7d6e250f37e 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -22,9 +22,9 @@ This command reads some patches or commit messages from either the arguments or the standard input if no is specified. If `--parse` is specified, the output consists of the parsed trailers. -Otherwise, this command applies the arguments passed using the -`--trailer` option, if any, to the commit message part of each input -file. The result is emitted on the standard output. +Otherwise, this command applies the arguments passed using the `--trailer` +option, if any, to the commit message part of each input file (as opposed to the +patch part following a '---' divider). The result is emitted to standard output. Some configuration variables control the way the `--trailer` arguments are applied to each commit message and the way any existing trailer in From patchwork Mon May 8 17:27:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234780 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 165F2C77B7F for ; Mon, 8 May 2023 17:28:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233475AbjEHR2F (ORCPT ); Mon, 8 May 2023 13:28:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233491AbjEHR15 (ORCPT ); Mon, 8 May 2023 13:27:57 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FAA05FCC for ; Mon, 8 May 2023 10:27:56 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f315735514so178735755e9.1 for ; Mon, 08 May 2023 10:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566875; x=1686158875; 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=LI0JwmXyecySSFZHMiWWb+1w73bvXr09fOJe/nA8TFc=; b=jTwHNz5e8z57+sedy9GPLoZeEcwtRK3hLjJeG4E52CFBvocDInd8s5k5XCylFATDDd PWGbKzE+lMPesUmFhzo9sBOTE47aLeW/PDXg28bEnlLJD3JkhRH3rbHkvC1oFA6pn5OD ZSAwB4iEmWz/yY2H1vUUrg7P/XSxKYFCvHxfkfPMlXGC0G0IAEROwgSmDpB758k8lulz eAt1uxN66XHA3r/u5aCdo/if+4iqD8+6as2JYkaCsISS+/F6fA9vKgzbln2BPLJwfpy9 Vje5h1YhQbEXAcAdkRoBDylrjUog0xap8duBu10eamPomwhF2MbMHxrfR8FYWAQZRS9k MPzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566875; x=1686158875; 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=LI0JwmXyecySSFZHMiWWb+1w73bvXr09fOJe/nA8TFc=; b=GfV4It9hqgEmqZlXCR7VTK5FPDeQhG28wzMZqbhhyf1gZKXECyh4A887FDk5fdWO7O rG+n2DtSZCAnktz4Ps7M6S5jsYwUNmGi3eLh5Fk8lqWQrfpIgIHTh5+3nIxrkyuN8mPi 7vePVrFSrnztvHjCcDswaq9c2N+JYKqAAWuYOpssVKtqoZl8NjHswWLfun9CWDDAH+sy l0MI87Q1XuV+f8Mt7dJiXmUxT/IVFD2qrw98xZdTZ7gWSIr3BF8SsbFaBhOcU0G/Ba5u wh1hhj/G1cYvF5+T+u79YvopKxYqxlHVW2jXIZ9zIyBk5dTmbHrZQ0hbgfOuz1fIthVI UG+A== X-Gm-Message-State: AC+VfDyrZ5R7Oflnfqh7lBBgu6ZY4pARlfXK8FLoxMMzuEMxRbdseGw3 odODNWUri/7ZuGscm1f+YPQZSoqOO08= X-Google-Smtp-Source: ACHHUZ4X67zkOOEfY/Atp/0BgOLiTMt4IUzq8kmCam2W09ptNZyvIK/zpuLnndtLPZzEqtdBAAPEjg== X-Received: by 2002:a7b:cbc1:0:b0:3f1:89de:7e51 with SMTP id n1-20020a7bcbc1000000b003f189de7e51mr7070192wmi.12.1683566875091; Mon, 08 May 2023 10:27:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y5-20020a1c4b05000000b003f429d59e37sm304099wma.34.2023.05.08.10.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:54 -0700 (PDT) Message-Id: <5bad365c78673d3f5b58e4cb3713a9bf718d1fb8.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:44 +0000 Subject: [PATCH 05/11] doc: trailer: remove redundant phrasing Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver The phrase "many rules" gets essentially repeated again with "many other rules", so remove this repetition. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 7d6e250f37e..e80a9cd161b 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -68,9 +68,8 @@ inside or after the value. The value may be split over multiple lines with each subsequent line starting with at least one whitespace, like the "folding" in RFC 822. -Note that 'trailers' do not follow and are not intended to follow many -rules for RFC 822 headers. For example they do not follow -the encoding rules and probably many other rules. +Note that trailers do not follow (nor are they intended to follow) many of the +rules for RFC 822 headers. For example they do not follow the encoding rule. OPTIONS ------- From patchwork Mon May 8 17:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234783 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 B1A3EC77B7F for ; Mon, 8 May 2023 17:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233887AbjEHR2K (ORCPT ); Mon, 8 May 2023 13:28:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233569AbjEHR17 (ORCPT ); Mon, 8 May 2023 13:27:59 -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 8EBCF5FF5 for ; Mon, 8 May 2023 10:27:57 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3063afa2372so4408032f8f.0 for ; Mon, 08 May 2023 10:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566875; x=1686158875; 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=f4XuQ5rItvstgVqXa2LTkbSyy61Uog65+NnkzjrB9CY=; b=EbawhBEBW5nl+R2zjoTpkCrRGO6esU1GSp9dWE/A0vE/LUQBvnS2YJbFUVtTpjawOi 6fZ8iKf1+vRxXwsdNhxAxo5K9q+MCDz6xtJgLFygtgOx95fP+Dasv9HcEmY1ulse0+N2 O6O2m7FUF+/990VvOidq40Y1+yo0R6nX+zbvsTXhmRvuu8vaCMKwfRR3r1ChdA9vYwpU qeiSyOU0kZtt11VV1HJqXe0Bzgqa0e0StOCmwfxd4AfjHXI1An/+aMOcfSNUFEPY+nYi Plr5je5gT3LrFeBByNXdxOi87lNKeC6rdZNittchu9tZlWA36qs9bD6a2gibSyagQcu7 YWow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566875; x=1686158875; 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=f4XuQ5rItvstgVqXa2LTkbSyy61Uog65+NnkzjrB9CY=; b=AvCVrcFVx49J0TqaeJl+Hrbx6vDTvdGkdv4vM9+bTQJmrLpEk6x3JUijbbhuqpvf5X 67dyhA2OFlmFZ2aRkU3QHXxiBtfRar8zU8aJiB9TyQC9dQT321PDBYeUnejh70Rl6V3a ou1UZuTdHVMj+lYAl0NegKyScuJ0mQrjk53hCQaaz6PLFC9cPzV+k4glncImbQsP4oar RRYv6nRzR3c+7IzIk0n42nfwTLCWq9GCHySC/kRiCCbkHTKgVla5KfWJyPn5TsphJ/Ae b4BOKPz0U688l+hm5blfHlW9NrhOc4b+nh16LZ21V6rJFYVWf2nz7Qn7Pp6luYQe1D/t d9Yw== X-Gm-Message-State: AC+VfDw8JtbxndANLcVuxB2ao7x2oRCrh+Fd8wlwP0uLYnkJNBeOVd+G AxQu4kAcoWfk4NsL8X+7pDdFpRJvUqY= X-Google-Smtp-Source: ACHHUZ4KdUGcRpEOuuJexXlO/CBml7WEHZ6WUbX6Es1bEKH3Yidcx0xOgYYctK6Q8tgd0iiL00teJQ== X-Received: by 2002:a05:6000:124d:b0:307:8800:bbdd with SMTP id j13-20020a056000124d00b003078800bbddmr5612698wrx.64.1683566875754; Mon, 08 May 2023 10:27:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i6-20020a05600c290600b003f18992079dsm17369928wmd.42.2023.05.08.10.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:55 -0700 (PDT) Message-Id: <8e36d1bd1f0c8ca6b1210a537f4bb8403fab7c47.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:45 +0000 Subject: [PATCH 06/11] doc: trailer: trailer..cmd: add missing verb phrase Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver The phrase "is specified" is implied. Make it explicit. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index e80a9cd161b..c4675d9d3bb 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -248,10 +248,10 @@ for the same , 'trailer..cmd' is used and 'trailer..command' is ignored. trailer..cmd:: - This option can be used to specify a shell command that will be called: - once to automatically add a trailer with the specified , and then - each time a '--trailer =' argument to modify the of - the trailer that this option would produce. + This option can be used to specify a shell command that will be called once + to automatically add a trailer with the specified , and then called + each time a '--trailer =' argument is specified to modify the + of the trailer that this option would produce. + When the specified command is first called to add a trailer with the specified , the behavior is as if a special From patchwork Mon May 8 17:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234782 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 7A054C7EE24 for ; Mon, 8 May 2023 17:28:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233708AbjEHR2I (ORCPT ); Mon, 8 May 2023 13:28:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233552AbjEHR16 (ORCPT ); Mon, 8 May 2023 13:27:58 -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 3391F5FEE for ; Mon, 8 May 2023 10:27:57 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f41d087b3bso22879975e9.0 for ; Mon, 08 May 2023 10:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566876; x=1686158876; 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=ClvK8BtvBIYgzKlMNMEQsfsEDf4ORu1leESkTTN86EI=; b=gczAP4y2fhGImE4nIQIY4aeU9rOfv9LulWiMjTe5DvBxjemHoTBDdtzojh9Z+eET9N M50FdMqlWz3awwcDENXgRDO6F31pXegQmc99dNUg11YJnVIuCT8NpHTKFm7hCSEa0YIW LUnc27Qu8tx6ySe2WGUczy8YILc5eATt8pIY9GqtQIRFnyOy6uhS1W5TOVQ/Zrs4LJBf /HnF1in323u9iQmCEjywMeWNXHkH29NKuJjvdBhRs38ZaHd7dEi/sl/Pu0v5gkP8eu2X OpyftZJ85n5o7DDbQCBRNtpJ9826Gw2gFtNqiCNtvZsLitlMNFi+APIrHN6QiPKG8Zi1 yO1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566876; x=1686158876; 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=ClvK8BtvBIYgzKlMNMEQsfsEDf4ORu1leESkTTN86EI=; b=I/bJJFlNgApoO1Rsp7J8bT21pH121G+tpSW2or6L/B8RJC+OrHQn2qugZP1Y/MMH6p 2rSC+LazT6h1dsN4rDvQV0RlH5dZHG7qGnhrXGasR0qKkh6eGLsEnADZqkHZQmipsO/p rlWrSaYpYFZYSoduOo1ggDF30ac88FZARF8rZP3JfpdmvF/HMfqMh5YCWTIPU19thW/F tARfysBfslRZfD6RXH/4qOik9q9gEiy4gc3G+vFyviNVT2sVWeU9lcBqME7Jw217XrcI MTX4E2oF7oykOErCxg/M25mc6yRnPsDuE6lBDHcscJxkSLJwxCOpVe73OzykbnuuZddk qYBA== X-Gm-Message-State: AC+VfDz1s4YCqV6HPxSP01aeaXApmUA8HKGG9wl3epmdJiOsjDwRmvGX ztuDm4zpb4ofqlLIa4EKQuGYDoMdgJk= X-Google-Smtp-Source: ACHHUZ5OlFeAOIGUXql2wyKT+mk6Cu/vcaSg1UXRIfIRFJsFfDgYsTwvrBvx9d7z5W7UVK9hPHjaNw== X-Received: by 2002:a1c:ed03:0:b0:3f3:468d:d00f with SMTP id l3-20020a1ced03000000b003f3468dd00fmr7306280wmh.20.1683566876590; Mon, 08 May 2023 10:27:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003f33f8f0a05sm17487979wmi.9.2023.05.08.10.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:56 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 08 May 2023 17:27:46 +0000 Subject: [PATCH 07/11] doc: trailer: use angle brackets for and Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver We already use angle brackets elsewhere, so this makes things more consistent. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index c4675d9d3bb..ac448fd732e 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -62,9 +62,9 @@ space or the end of the line). Such three minus signs start the patch part of the message. See also `--no-divider` below. When reading trailers, there can be no whitespace before or inside the -token, but any number of regular space and tab characters are allowed -between the token and the separator. There can be whitespaces before, -inside or after the value. The value may be split over multiple lines +, but any number of regular space and tab characters are allowed +between the and the separator. There can be whitespaces before, +inside or after the . The may be split over multiple lines with each subsequent line starting with at least one whitespace, like the "folding" in RFC 822. From patchwork Mon May 8 17:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234784 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 B4D0AC7EE24 for ; Mon, 8 May 2023 17:28:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233903AbjEHR2L (ORCPT ); Mon, 8 May 2023 13:28:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233714AbjEHR2B (ORCPT ); Mon, 8 May 2023 13:28:01 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72D9C6EA6 for ; Mon, 8 May 2023 10:27:59 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f41d087b24so15286465e9.1 for ; Mon, 08 May 2023 10:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566877; x=1686158877; 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=Z3+j9QgxL4P8mKcAXH6CqgBFH+lXHZmyTSbGBSRYlFQ=; b=dY42/IlRlZZNyZUAV0QBtH17np6teT3YogABsIAv+lJxdvvIm1UfrvKkFFrj5DsXsV 6ziJBN0JWS5ggaFH8C8Q03uJnH5SmYl4ubkLrRZHBvI+vUfWTr9ozs/S2rWvbsMgzFi4 bbY1zVMp4ZtkdcJhNv78lg3UF/qqeG2v7PgohsoR+FDYlUxlOTRV/GeAvZDiiN08Rf/P 9C5Mw41ANGIMurOoII9d15keWQfv7/4IF1/+ijRm4/wj6MasWdFBikMzdr+xpLi7C8YD m3l8uu11TQOwd3G9Ujzo4VWfpk5wbzmoYBbJs6Hv0d66z3aSKSz7DkBWOlvHVJaYNXPN miaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566877; x=1686158877; 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=Z3+j9QgxL4P8mKcAXH6CqgBFH+lXHZmyTSbGBSRYlFQ=; b=Bz8728UM+SIoDOa6Tjxur5aNZMPbMMENXiIRgrGv95J0ZbE2K5l1C7T8gXi/Ljn7To JNXYAGbOKBg6Z2AUji0vRCOz1baGsZJZmqhBw9hHamFRUkvPP5OMvAKC8wtpV3x8PePM U6vaR+zqRojz8g3YnrbzZyz7xgUE69r1OKjbrcF3O2lCrxRyH4IkVh/2EfApv/SBDTZb UETV5970AHjhVoCWPYpo/UnKVZjZKFD7HOBqebn9oeOgwRRW36x/PdNQK3o87w9vWNA1 t5GTaMSOdc6tn7SGug4+TRYnjrgRM9mhmhpznFordkvK4hGksXv1OQe+rNpw8MK8hfvP SG+Q== X-Gm-Message-State: AC+VfDy+wBSjETazedT/YZguQj83Yyx7kDHz9QOyHUjBHi93Zn9PLwXf 6pEL/vSeNZmPWZQ5mzrFLT4dIYW5awE= X-Google-Smtp-Source: ACHHUZ7HcUlqIBKdRBqC9DccwFBRvr0BNi8K+lhuK3abLgEmPDTnF2dAnyZIF1YZZyugyBEPHdqn1Q== X-Received: by 2002:a1c:f408:0:b0:3f1:7372:f98f with SMTP id z8-20020a1cf408000000b003f17372f98fmr6727254wma.41.1683566877388; Mon, 08 May 2023 10:27:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y5-20020a1c4b05000000b003f429d59e37sm304184wma.34.2023.05.08.10.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:57 -0700 (PDT) Message-Id: <5980432179352054955e602cf97b57e97694a28c.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:47 +0000 Subject: [PATCH 08/11] doc: trailer..command: refer to existing example Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index ac448fd732e..5ca758e363f 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -234,10 +234,11 @@ trailer..ifmissing:: that option for trailers with the specified . trailer..command:: - This option behaves in the same way as 'trailer..cmd', except - that it doesn't pass anything as argument to the specified command. - Instead the first occurrence of substring $ARG is replaced by the - value that would be passed as argument. + This option behaves in the + same way as 'trailer..cmd', except that it doesn't pass anything as + argument to the specified command. Instead the first occurrence of substring + $ARG is replaced by the from the trailer. See the + 'trailer.see.command' trailer example in the "EXAMPLES" section below. + The 'trailer..command' option has been deprecated in favor of 'trailer..cmd' due to the fact that $ARG in the user's command is From patchwork Mon May 8 17:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234785 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 3ED2EC7EE22 for ; Mon, 8 May 2023 17:28:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233645AbjEHR2Q (ORCPT ); Mon, 8 May 2023 13:28:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233463AbjEHR2B (ORCPT ); Mon, 8 May 2023 13:28:01 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB4356EA7 for ; Mon, 8 May 2023 10:27:59 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f41d087bd3so14851045e9.3 for ; Mon, 08 May 2023 10:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566878; x=1686158878; 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=Yw2OBZrwzFzo9jeehJqb2CHuwbdEr31fSzsxTX3Z+tU=; b=Ym5ZnWAy5ZHdrmmSzYgUxx7N4XotboDSZ1GugaoQCIgRKnE4GCiGPvam9VnMqIJfCJ ZrsbgJgltMcHhCMw/TbkKtxlCp/qAM9UJUSPUZaSuuG6UhqyA6oalkFoiYZ8MKiAoUqt tvMb0vDfvaPIOoM7LFVFUFqIGmJy6SYI9QrjXzUyUNrcpncmUYrlxTifi4m7lnbsCNe5 rD2iuttOEW1FD0dCFv0Cl5+PuAmjjMq2BhE135kh6RpRFMCqsxiBXquesfKw2R+msdyd WcmIx//BkDfEz0kkRrR4Ew2K6PZhFrNUatS2i146ElV6HL2kXdD6BmY8HSpAj/qrXsBp 4Cbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566878; x=1686158878; 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=Yw2OBZrwzFzo9jeehJqb2CHuwbdEr31fSzsxTX3Z+tU=; b=eKYW8DDyaGfjhhAM8nvSp8HWvVCz+IkSQFoGPqwekqw5pgtGc42AMwQts1c389Ey5a fRdlI2fP7Gp+ZJeajfzCMylrLYmABX28MbOHqpQCip3+qjcMqeRR4HhHVFO70FviFEKf /OJwRdDL1vUKkxj8Ar+Y7fEsXNOfSm+P+PXq5Bb76zHhz/pepPM+11l9AJ1RhPzLrCIG qjkU6CF5sbe9adCYphgf5N1VaBBB6G1GIjSuA4+O0IcbwiCHXkevbax4RSI38RgpX6ee /KNJ3qImho8LrcNd/M7OdFm40/xYfsGSPIX0YSw4C1UMp2FoilL1JLyrnvsAkIGmHVlE 7V6g== X-Gm-Message-State: AC+VfDxv7NHIzTBAL1p+VGMyaiXDAjbbWJRbi9XdDBE1b5tCFZVFIOJM gTRRCNnk1XK1fpdIRd+Z2a0o/yR8TXc= X-Google-Smtp-Source: ACHHUZ7dLspAFseOUaDUvC8d+ndD2STRsW83wrHVLOexV48/FPvskieWcU+zMVIWBf3aWzu4f73IFQ== X-Received: by 2002:a7b:c8c6:0:b0:3f4:2220:28d5 with SMTP id f6-20020a7bc8c6000000b003f4222028d5mr3998178wml.29.1683566877983; Mon, 08 May 2023 10:27:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q1-20020a5d5741000000b003063b0c94c4sm11998223wrw.46.2023.05.08.10.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:57 -0700 (PDT) Message-Id: <1ac58b0b07c21fe4494f5fbe5d4b0f9bc1a49ac0.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:48 +0000 Subject: [PATCH 09/11] doc: trailer..command: emphasize deprecation Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver This puts the deprecation notice up front, instead of leaving it to the next paragraph. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 5ca758e363f..c9b82ceba34 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -234,7 +234,7 @@ trailer..ifmissing:: that option for trailers with the specified . trailer..command:: - This option behaves in the + Deprecated in favor of 'trailer..cmd'. This option behaves in the same way as 'trailer..cmd', except that it doesn't pass anything as argument to the specified command. Instead the first occurrence of substring $ARG is replaced by the from the trailer. See the From patchwork Mon May 8 17:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234786 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 5A65AC77B7F for ; Mon, 8 May 2023 17:28:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234046AbjEHR2Y (ORCPT ); Mon, 8 May 2023 13:28:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233869AbjEHR2G (ORCPT ); Mon, 8 May 2023 13:28:06 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6A25729C for ; Mon, 8 May 2023 10:28:00 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f41d087bd3so14851195e9.3 for ; Mon, 08 May 2023 10:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566878; x=1686158878; 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=zotUQjqa062F5MjbHVx0PvV4jScR+pyZF1O65Od+bRM=; b=KV9LzBaJXWCqlCr5ksj/L25Bw4sEYyVxG5fTRU0SCUcsccy+WNZCKAysM9Mx75RI0L 4wozVNFN/rfV1MSOSS6N98aknVOa6+W1SRmwHlCLIIySwUKzGbWMw6p7/TMO55qY0HVW deJLBf/gDKM99uHhRJkSkRhRkVEcJWssup7M8xczq3KsPb/eD6oOFRBuSVsgiVEBKybl 15wxcpS0r+QkBz8u8qCiYiv9fR3UBefAqA8Yro7K7fFfWTw4oMWfeLcVON8JtuWxHTvI O3dgYss8IYNRnsbGGdiPykHv8xAdJyLJICTzDn3vhl4szmnB7YRPPdMxY+MIFf8MaMrU UzJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566878; x=1686158878; 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=zotUQjqa062F5MjbHVx0PvV4jScR+pyZF1O65Od+bRM=; b=KWdgY162e8GnKxDH+SJZVywriC/itj7MrntWHi935pVc2Zv5yVlJHN6qzhT9gTozzP 8imN9Xjjg8eKGdBtBbLhzNmKEjtWfoSEhJTtWHnPlRMPW6BqxV1VF02MfQId7WwsKR+A IsPbEa7PaN3oamM8lnN7szYJhSICvZPnl0EwMF0mZrIp3OeubpyaVgMXTQG2yd9uN8Fx Jauqehv7k8LSMVDDlcItDBgkk8Jjk7BrB2jmvZlUvFCh/xc1jhl9+xRROenOWSN4jtLt 8NT4VMFiBE5VjZgWA62HaMMOD4JvKk9Zi00xkkXQcyHslyVPpLQrRbtd/hzd4gdOSZKw Zv5g== X-Gm-Message-State: AC+VfDxe6QwQG0K3sAu3fcj5/CvNTUQl/EoJ7nW28VE4uR04QtBwEER0 5U9JQJW/nvqH35qP5UQcTho0uFtUD/o= X-Google-Smtp-Source: ACHHUZ7Wf3MhukMgakiEBuGYjmlOd4i/el8Ja9u53bg7RygbTCZ2P5VhI3Cl/mjrtnOUDil032RXVg== X-Received: by 2002:a05:600c:d2:b0:3f4:28db:f609 with SMTP id u18-20020a05600c00d200b003f428dbf609mr1130581wmm.36.1683566878756; Mon, 08 May 2023 10:27:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f5-20020a1c6a05000000b003f4266965fbsm3142800wmc.5.2023.05.08.10.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:58 -0700 (PDT) Message-Id: <2c04a5ba7f0ac16fe648c7dac2684523429378af.1683566870.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 08 May 2023 17:27:49 +0000 Subject: [PATCH 10/11] doc: trailer: mention 'key' in DESCRIPTION Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver The 'key' option is used frequently in the examples at the bottom but there is no mention of it in the description. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index c9b82ceba34..119dcd64f34 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -43,7 +43,9 @@ token: value ------------------------------------------------ This means that the trimmed and will be separated by -`': '` (one colon followed by one space). +`': '` (one colon followed by one space). If the should have a different +string representation than itself, then the 'key' can be configured with +'trailer..key'. By default the new trailer will appear at the end of all the existing trailers. If there is no existing trailer, the new trailer will appear From patchwork Mon May 8 17:27:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13234787 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 A78E2C77B7F for ; Mon, 8 May 2023 17:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234077AbjEHR20 (ORCPT ); Mon, 8 May 2023 13:28:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233677AbjEHR2H (ORCPT ); Mon, 8 May 2023 13:28:07 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 900436A7C for ; Mon, 8 May 2023 10:28:01 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f193ca059bso30717475e9.3 for ; Mon, 08 May 2023 10:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683566880; x=1686158880; 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=Os4sRIRmYmcV41FMax7IRzuuBHIiAQQgzQ5x4lTYH2s=; b=kWpF6xEevSzkYx5+cLcLXCyOvYRNfT27ikeUxlLu9qRe7UErF5gGQEUF8xWjyhxLa6 rk5DAd9WA0NW9rITAoN0y8T9gG0Kr3lK99J0JLLA8eA9seddJ/SvsVIilK7GzXx9x1Tf MMvyKTKdw9VE0qcTvftsRjwyOxsP3T9bvb10sWMNnJ1VZU+qyrn2AziBz+DJPdYa7VZ/ JDhcYS+mwngSughi7/X2y02hrrnkOWq+5lV6Om5ZO+gvDSV1e8IY7HeCx25mApD9zxBL JAHNVi/W0VxqmWt5If2DCL8Lr5h4ldCJifwOkNBIRzf+O0IoJIr4vhrPohpLFrOa09Zk ImKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683566880; x=1686158880; 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=Os4sRIRmYmcV41FMax7IRzuuBHIiAQQgzQ5x4lTYH2s=; b=F3gUQYLvm0G0C3mZV2jxKwViAIO3wxuIoanAySOc+E5F3D39GflFpibCESuGMpp2hp Hqnm5l4/A4R6iIHK3y5ArwESAhNTQb7EuPaNS5FsPL5kSkvoZvwLaHSfDtRXXG7JOWWx 2OXo6A5Tqj7HemrrY+K/EsoqzZKwHlW2vK41NOr23pM8tRvcD5BQjP30sj9TnLvImYmd VSAIbx1CzJ5NEi+OAk3bVwXxx1YFox+IAh3GkVCm74wSfPWal9aYbquZPrl/L+TZKSBB w35HTbqFWs+u5lK71vCZ7dGWPckrG+GdhGSEcjAE6W3dP1/OGpEwDkGckqRIsM6EoAuf 16IA== X-Gm-Message-State: AC+VfDx01/jvCNJfCgJcUrpBevRp2sBZmmRt92Th0p99EZK0tKspUm/1 kh5GsYyvXY/Mcj/ifeEvUV7sWPlghkk= X-Google-Smtp-Source: ACHHUZ7J3UDT4bWxO7TfaJgY8RRk+Et57bomb2jefDH/tYZK7BP0wo0Jjo5Zj2nZ68yjPSL2qhng3A== X-Received: by 2002:a1c:7519:0:b0:3f4:2452:9666 with SMTP id o25-20020a1c7519000000b003f424529666mr2901852wmc.40.1683566879521; Mon, 08 May 2023 10:27:59 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x16-20020a05600c21d000b003f318be9442sm17569273wmj.40.2023.05.08.10.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 10:27:59 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 08 May 2023 17:27:50 +0000 Subject: [PATCH 11/11] doc: trailer: add more examples in DESCRIPTION Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver Be more up-front about what trailers are in practice with examples, to give the reader a visual cue while they go on to read the rest of the description. Also add an example for multiline values. Signed-off-by: Linus Arver --- Documentation/git-interpret-trailers.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 119dcd64f34..f31b94a6823 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -16,7 +16,18 @@ DESCRIPTION ----------- Add or parse 'trailer' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit -message. +message. For example, in the following commit message + +------------------------------------------------ +subject + +message + +Signed-off-by: Alice +Signed-off-by: Bob +------------------------------------------------ + +the last two lines starting with "Signed-off-by" are trailers. This command reads some patches or commit messages from either the arguments or the standard input if no is specified. If @@ -68,7 +79,12 @@ When reading trailers, there can be no whitespace before or inside the between the and the separator. There can be whitespaces before, inside or after the . The may be split over multiple lines with each subsequent line starting with at least one whitespace, like -the "folding" in RFC 822. +the "folding" in RFC 822. Example: + +------------------------------------------------ +token: Lorem ipsum dolor sit amet, consectetur + adipiscing elit. +------------------------------------------------ Note that trailers do not follow (nor are they intended to follow) many of the rules for RFC 822 headers. For example they do not follow the encoding rule.