From patchwork Fri Mar 31 18:12:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13196479 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 6887BC76196 for ; Fri, 31 Mar 2023 18:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231454AbjCaSN1 (ORCPT ); Fri, 31 Mar 2023 14:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbjCaSN0 (ORCPT ); Fri, 31 Mar 2023 14:13:26 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7586FD52B for ; Fri, 31 Mar 2023 11:13:25 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E275B5C00AE; Fri, 31 Mar 2023 14:13:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 31 Mar 2023 14:13:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1680286404; x= 1680372804; bh=kFRlj3FrcBZBMmTOrXeDHIZbFiEA9ziwGeikLhYIsqk=; b=U IqiTSMORrhDsyIV6tTOT/Ihky8m3Uty+FldFwKL1tkvLYyo7nByjHSBWsoMHn8EH cHUDeJua3H4SlCQeY7qeKb9CJ7x5Cf8DjXh7IdKXc/WPkufF8c76ozGbhsidj79C URIJxSsBoMV/Q+GeQK4B6x2R+iJ0n6u55vrBQxhif4myW/l2iPweA/JwLctnbwi0 oxmttn4DcZlTGkVyfVwSCaVIb+8ZiSg2TTMQIPQKAUXlPzivjcBPZe+72WsA2lk1 h1qIGxTev7s35CVoxB1JVI0uy9LPbi0bviiwNefF89lxSATfUft910+xq4KuLxFb ao/UFKND+IJBegGS+p18A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680286404; x= 1680372804; bh=kFRlj3FrcBZBMmTOrXeDHIZbFiEA9ziwGeikLhYIsqk=; b=D sGnOd4Ho8Pvk4elxJc50GtArcaDrTcXEW/+oX7SXGEAVcxyKFqjzWnF9ykEs5GWY kqzVHn+EPqm16vtH2TxtB+mBqnJomX1t0j5JK9aOqG47l2xx8u70x7xrzkLxmGw+ t/CI0/kP9XZuWsyme9fpHjQL5vVkSoSrRmra1Pvvv165C0ExkTmkP6fD2/LZaqTJ QadPU0FjZuXcbzyff8r3SQvCLe6NJ5eNc5mQkiEXqnvoSChhEtTRp5RjoVXouQWa DCvez826rZUdiEOyUCQFbr/D/QP/c+nb8wn8C0r2uGG2Guyufgr/7Sfr9DwJrjv4 wOW1oIFlCTJbsg4RJOCHA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeiuddguddulecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceo tghouggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetud eiheeguddtgfduveekhfevudeiieetjefhffetiedtgeejieehtdfhjefgteenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrg hughhssggrkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 31 Mar 2023 14:13:24 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk Subject: [PATCH 1/3] doc: interpret-trailers: remove trailing spaces Date: Fri, 31 Mar 2023 20:12:29 +0200 Message-Id: <20230331181229.15255-1-code@khaugsbakk.name> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331180817.14466-1-code@khaugsbakk.name> References: <20230331180817.14466-1-code@khaugsbakk.name> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Kristoffer Haugsbakk --- 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 22ff3a603e..787332771e 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -408,9 +408,9 @@ $ git config trailer.see.ifMissing "doNothing" $ git config trailer.see.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" $ git interpret-trailers < subject -> +> > message -> +> > see: HEAD~2 > EOF subject @@ -429,9 +429,9 @@ See-also: fe3187489d69c4 (subject of related commit) ------------ $ sed -e 's/ Z$/ /' >commit_template.txt < ***subject*** -> +> > ***message*** -> +> > Fixes: Z > Cc: Z > Reviewed-by: Z From patchwork Fri Mar 31 18:14:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13196481 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 83024C76196 for ; Fri, 31 Mar 2023 18:14:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232016AbjCaSOu (ORCPT ); Fri, 31 Mar 2023 14:14:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231253AbjCaSOr (ORCPT ); Fri, 31 Mar 2023 14:14:47 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE9C0DBE3 for ; Fri, 31 Mar 2023 11:14:46 -0700 (PDT) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 45F1D5C0144; Fri, 31 Mar 2023 14:14:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 31 Mar 2023 14:14:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to; s=fm1; t=1680286486; x=1680372886; bh=/8ZkRFyNvmDqcOGxr1mquHr9m vq5jukichXQLo1uBNE=; b=RU/lXu1wkiz+c+yh1HdChwaXACtHtT+Rrdsa0ksZ3 eFiiYgBN32zsgQHZmYqo/FlYqr+RrRb6ceMZa5aBvlSlt25fu4ltP4atAb+HztrF BRAaTx0R4ekXvZUhDh4IaTUIlGoVRJlMZn0MIoqTLSCAytnLHW1471xJdN0SOLgB d66UMjNDrJFERGz6oPPtv99ydkBOnd/U6/YJL/ebCQSESruSYvbc7T4rx6Qdo2CB bRJ1VrlGGGmRWqiq1FuAN6F46Uq4+i/WpfPOdOUkgvDgI1R8CfD48el2LFvR2uCH XrOYl4gqqFLh8/r5pga8wHT8R2SFHOpEy73Swn1RQQWNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1680286486; x=1680372886; bh=/8ZkRFyNvmDqcOGxr1mquHr9mvq5jukichX QLo1uBNE=; b=WH2glAMnnoSa9d8UU16wKxCKMhHxvEMdyTHWajdnbmPNOXxLXOB rNNI4dcFfMqmNgGS7vkrr+fhp2fHyfbO07t3troIPY/vb6dzo+kLq+Aq1O9MmR5r pcbjJRCTEymITFYg5woM3SZwRpqnW+yu8ZZ4VnMsKNkLq2uLIY1mxiyFNwA2Mm8v LUyWWdra6W8qUuvrW6e2EGigrLeES0ktK4gRx1eOwFc8pX1x9ueCrF37BAfUqsOw E4YgrhCnZKLRKHf3dy53ZQB+0RrFHq41D05Yfbi2w5kDEmRXQ32cf9tR2SoOh6Ha gBrFCEemD5XJqHjjJemiVUO8FJ8zb5JkWNQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeiuddguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhggtgfgse htkeertdertdejnecuhfhrohhmpefmrhhishhtohhffhgvrhcujfgruhhgshgsrghkkhcu oegtohguvgeskhhhrghughhssggrkhhkrdhnrghmvgeqnecuggftrfgrthhtvghrnhepve fgleevieekgeejieekueevhfelieduvdelgeefkeejtdekvedttefgffevtedtnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghouggvsehkhh gruhhgshgsrghkkhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 31 Mar 2023 14:14:45 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , ZheNing Hu Subject: [PATCH 2/3] =?utf-8?q?doc=3A_interpret-trailers=3A_don=E2=80=99t_us?= =?utf-8?q?e_deprecated_config?= Date: Fri, 31 Mar 2023 20:14:22 +0200 Message-Id: <20230331181422.15409-1-code@khaugsbakk.name> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331180817.14466-1-code@khaugsbakk.name> References: <20230331180817.14466-1-code@khaugsbakk.name> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `trailer.sign.command` has been deprecated since commit c364b7ef51 (trailer: add new .cmd config option, 2021-05-03). Use the commit message of c364b7ef51 as a guide to replace the use of `$ARG` and to use a script instead of an inline command.[1] Also, explicitly trigger the command by passing in `--trailer=sign`, since this config is not automatically used.[2] [1]: “Instead of "$ARG", users can refer to the value as positional argument, $1, in their scripts.” [2]: “At the same time, in order to allow `git interpret-trailers` to better simulate the behavior of `git command -s`, 'trailer..cmd' will not automatically execute.” Cc: ZheNing Hu Signed-off-by: Kristoffer Haugsbakk --- Documentation/git-interpret-trailers.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 787332771e..792d61ae7b 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -325,7 +325,7 @@ $ git interpret-trailers --trailer 'Cc: Alice ' --trailer 'Re $ git config trailer.sign.key "Signed-off-by: " $ git config trailer.sign.ifmissing add $ git config trailer.sign.ifexists doNothing -$ git config trailer.sign.command 'echo "$(git config user.name) <$(git config user.email)>"' +$ git config trailer.sign.cmd 'echo "$(git config user.name) <$(git config user.email)>"' $ git interpret-trailers < EOF @@ -402,11 +402,14 @@ Reference-to: 8bc9a0c769 (Add copyright notices., 2005-04-07) commit that is related, and show how it works: + ------------ +$ cat ~/bin/glog-ref +#!/bin/sh +git log -1 --oneline --format="%h (%s)" --abbrev-commit --abbrev=14 $ git config trailer.see.key "See-also: " $ git config trailer.see.ifExists "replace" $ git config trailer.see.ifMissing "doNothing" -$ git config trailer.see.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" -$ git interpret-trailers < subject > > message From patchwork Fri Mar 31 18:16:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13196482 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 22129C761A6 for ; Fri, 31 Mar 2023 18:17:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232077AbjCaSRN (ORCPT ); Fri, 31 Mar 2023 14:17:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230142AbjCaSRM (ORCPT ); Fri, 31 Mar 2023 14:17:12 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B5F1DBF8 for ; Fri, 31 Mar 2023 11:17:11 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id D73095C00CA; Fri, 31 Mar 2023 14:17:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 31 Mar 2023 14:17:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to; s=fm1; t=1680286630; x=1680373030; bh=v/EJuD6hCl//r3IQ+wFhqinGw iMhVtIxd9p+/SwHfGY=; b=a7AFCnkM37X3tvkjWNCMO/zbK4yIYQOucr6TbOCWv K2AIr3ry7VtoMmGJwgGh/WtmjziWP5SwEVZbp3t7MvBP0wjyGQAlKeiHo4RL6jGM /cVSM2T0jgFDbpIx6Q7XjjDo6PQD4gqUVvZnqZUDI/+fCprSsF0gegwo7fnPw7RS nCecVKtB6EQdmS/RgxvlvoM1Om7yUHq6p9JYJYPHw9mehx9KPqTXHEGJhtv/tbiz E38T4jXwDnUxzlRGHpdHj6CjWkgyzrl7RYsxpbATIT+9FRQvjgoWmjGfM+4r6OF8 d2SpwEEMZjii84nUGE7Un0UkFmT81eMVR0OR5eaGkoiwA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1680286630; x=1680373030; bh=v/EJuD6hCl//r3IQ+wFhqinGwiMhVtIxd9p +/SwHfGY=; b=hXe7TXw5dlC1AoRT07r88siVgRM8vCOUb98QSO7FgezsDupykg8 4/JZsRWyNC/pzd82tV7Swi47kTsSlpkCXqK0Oqe8KUCAyLulkTgBhgLURibF+XR0 BZz46L9MTLRoCjtwDDAryruyNe344PlTJepb67u7J3qMcJATb6Zu0Ft0hQTo5G+F HLBfuz97OyUOQ3HY/fmjkeLxqdghKItbTMuw1bARzYktzGPH11TuNw2q8OZU96dN MLxAfMgk/5qisk6CijjvduNxB2x9IUfqZKQ260pLCCjLaCi8lsMBUxwINf5ceX5e VN9fTmIzZliYomnOyu24J4Ft1BByGvnxnZg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeiuddguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhggtgfgse htkeertdertdejnecuhfhrohhmpefmrhhishhtohhffhgvrhcujfgruhhgshgsrghkkhcu oegtohguvgeskhhhrghughhssggrkhhkrdhnrghmvgeqnecuggftrfgrthhtvghrnhepve fgleevieekgeejieekueevhfelieduvdelgeefkeejtdekvedttefgffevtedtnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghouggvsehkhh gruhhgshgsrghkkhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 31 Mar 2023 14:17:09 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , Christian Couder Subject: [PATCH 3/3] doc: interpret-trailers: fix example Date: Fri, 31 Mar 2023 20:16:52 +0200 Message-Id: <20230331181652.15729-1-code@khaugsbakk.name> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331180817.14466-1-code@khaugsbakk.name> References: <20230331180817.14466-1-code@khaugsbakk.name> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This command won’t output anything if you don’t give it an input and/or a `--trailer`. Cc: Christian Couder Signed-off-by: Kristoffer Haugsbakk --- 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 792d61ae7b..2aa190fd3f 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -326,7 +326,7 @@ $ git config trailer.sign.key "Signed-off-by: " $ git config trailer.sign.ifmissing add $ git config trailer.sign.ifexists doNothing $ git config trailer.sign.cmd 'echo "$(git config user.name) <$(git config user.email)>"' -$ git interpret-trailers < EOF Signed-off-by: Bob