From patchwork Fri Dec 20 23:18:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 13917531 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41E42225A50 for ; Fri, 20 Dec 2024 23:19:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734736748; cv=none; b=Wp2ev/aTXR1rxscfFgc8eTXR/SFbRrhzMrYvFCq2a23vFEppH8pDQrNVGP/9qcgNH2GjWLHbpJtA7IIOCMGhVCXpVKNdDW9sxR+BAComGNuRsBcJunk5xTQ1H9n0undCEm1Dsj5GF9jJrp3n8hDGu53jSVXvpOXY4oe0oBFYbVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734736748; c=relaxed/simple; bh=kNN8giT6mSJVgHRrafsJRfeWkkZuJs6fUx1U3sejWdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZqAuTz62SBkFOpYf9KhfTvjL1yBztKnWMDpNnKVGMNuQXwLaUvNE49PteBI6GMOQqkn7o2wcDEMMjI1kDphs2kuTptmQ1M1pcvpLbvfDsJljoaeH7JLhOxmSpsiGd6mbCVAbOF9T16UiVxPBTjnK+bjcn2rldTo2q7cPQRJgDzI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WuUwZyr2; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WuUwZyr2" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5401c52000fso2336226e87.2 for ; Fri, 20 Dec 2024 15:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734736744; x=1735341544; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wh33UYwldurK/CO6sA0h1ZNjWzXi8BoS2c54DvkdKj0=; b=WuUwZyr2UDwK6r4WIDtPXIp+YrcRgG9wXnEfaZrt+AEHL3LNxP6yG0AKemZrS3/IcF wydoazxl9xWkXM6S+Z2//Iya8nI24OnPZI1vzrDAki0hlioHOAZUB3HcwA+XSXQU+L3K NqCrIArOwRknwJ9cebvRA/wOighNPKNfJ4BJNW1SAEo/MlFgneMZgUxQfYK+ANX7NWUr iIYFsgZr4cQH5XMKy0LC26AYykmVLVXJphaFK893LCLI0wSr+AuTaQAmTwUqDF5rYnhr Pqnd2wd+vRb1hgzBH/ODF3HFEHbpayNOhap2e2fjwU5yvZImseLkkIy891NmPR+/z2qa wbdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734736744; x=1735341544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wh33UYwldurK/CO6sA0h1ZNjWzXi8BoS2c54DvkdKj0=; b=tIif7QmSxPVClRSnYXCjd0pR2e0Jfhl7fvcnjZHPAeHXbIg+CBWeszw8RTYw1zAnEj gqoq4RtjBn6w4CEODodpqjtwx83xFW3YP31rx9OozQt19koa4TfdSJHOTpCdr6radm1V k24EhP8wEkMoQNy58w3zRqJkloMdmTgKReYDbCku8Wu/T30zJJOftLStaYKj/ccE+WVy 5XddBI/4KE2cjp4fTHGXxC8UF6x5bd2kluyG/wkf9Il8up62oN4WuDpQfeyAb6sT0dju GuGDv1X64NYA7f549xfTyi7gRawFc1UXtT8G/i3SkAIRCEO9DCfKFfh9qbKqI/AFStTR awxQ== X-Gm-Message-State: AOJu0Yzb7jiY40bfDON/yoMLfH5X+8cSdCynHugDaUKhMlYo7XAhoVJU Q26aR6wNxi4+7WuOa6e/OA8kEUK50ZY2WSBAhL+1frt55RcvHQVmJkXcsQ== X-Gm-Gg: ASbGncuP8WDhaURuCFjQDvUrFhaUbu8+v7HGOVpp7lvIqogguJQoTqc/e+do4QUlR25 IGYGUxqEl586zGL7ugBAhrXOw+wciqg7DQTXV2LV3KoFGFqhojPcR9HpwGyYFNbexzM4awpkNjI dwcBuQ7NSnbdtB9NPpr5u9u25RVPlCcnwqDxgCScLzrH6VDxH6FcyCZpHoa6qEjdEO2xuyAd+7W Mca1g5F5nCdD/DdvljjxsG8IKnALKf2AdJo1fb9uo7npgF2qiqUHabgWKeiWIWNxY12mjDwTVWw yTilL3wPh6KlgOtclS4mX0n7X6A9/kzxOsI= X-Google-Smtp-Source: AGHT+IHLsdB0l7NU4MXI3/N+lLU1fo2klKaoQDKAfluUY0kQdXx1bxa4Fqt2OLiGzb3v/1lSC/0BSA== X-Received: by 2002:a05:6512:3b26:b0:540:3566:5b37 with SMTP id 2adb3069b0e04-542295aa1cdmr1652803e87.57.1734736743910; Fri, 20 Dec 2024 15:19:03 -0800 (PST) Received: from localhost.localdomain (81-227-45-223-no2667.tbcn.telia.com. [81.227.45.223]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-542238137f0sm583733e87.164.2024.12.20.15.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 15:19:03 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Patrick Steinhardt Subject: [PATCH 1/3] asciidoctor-extensions.rb.in: delete existing Date: Sat, 21 Dec 2024 00:18:16 +0100 Message-ID: <8bdc26c1ae74b59f2c3cd3408111336ce3af1447.1734734612.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.48.0.rc0.241.g3cddc25e2a In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 After the recent a38edab7c8 (Makefile: generate doc versions via GIT-VERSION-GEN, 2024-12-06), building with Asciidoctor results in manpages where the headers no longer contain "Git Manual" and the footers no longer identify the built Git version. Before a38edab7c8, we used to just provide a few attributes to Asciidoctor (and asciidoc). Commit 7a30134358 (asciidoctor-extensions: provide ``, 2019-09-16) noted that older versions of Asciidoctor didn't propagate those attributes into the built XML files, so we started injecting them ourselves from this script. With newer versions of Asciidoctor, we'd end up with some harmless duplication among the tags in the final XML. Post-a38edab7c8, we don't provide these attributes and Asciidoctor inserts empty-ish values. After our additions from 7a30134358, we get     2.47.1.[...] Git Manual When these are handled, it appears to be first come first served, meaning that our additions have no effect and we regress as described in the first paragraph. Remove existing "source" or "manual" tags before adding ours. I considered removing all to get a nice clean slate, instead of just those two that we want to replace to be a bit more precise. I opted for the latter. Maybe one day, Asciidoctor learns to insert something useful there which `xmlto` can pick up and make good use of -- let's not interfere. Signed-off-by: Martin Ågren --- Documentation/asciidoctor-extensions.rb.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/asciidoctor-extensions.rb.in b/Documentation/asciidoctor-extensions.rb.in index c4c200dace..d8d06f9a57 100644 --- a/Documentation/asciidoctor-extensions.rb.in +++ b/Documentation/asciidoctor-extensions.rb.in @@ -29,6 +29,8 @@ module Git class DocumentPostProcessor < Asciidoctor::Extensions::Postprocessor def process document, output if document.basebackend? 'docbook' + output = output.sub(/.*?<\/refmiscinfo>/, "") + output = output.sub(/.*?<\/refmiscinfo>/, "") new_tags = "" \ "@GIT_VERSION@\n" \ "Git Manual\n" From patchwork Fri Dec 20 23:18:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 13917532 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DA0A226883 for ; Fri, 20 Dec 2024 23:19:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734736750; cv=none; b=q5g0EcrR6GYr/UxkdrvpibNOvcVKLHn4OSsggg8UUXpOvducczUEZFQ0dFzjjB6BdSEbz+VTgR+EVecMR9/YYNPnLn5Hay+fmsahXZ2gfm8nFyOe/R8Cy+g4ohAYzdHa1S4V5KB/qMn3xE0hmcsG65+NqR1eNn6h2dRHSDp1LIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734736750; c=relaxed/simple; bh=OxPRFBbkeBEtcyDflLwxNrDx3uMMaZhtW9RZ6DZBUa0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S+FSun5iDeUITN2dmgdC322kMoyylDKMnPhKRQde7Y81AW8Pd2r1Ev8skppJsC/VjPCNNwVKm5+ZYDJoE4XuyawWyqmei54w8+pzz2ekfQuph4pXhscNJljxlmPnN3Ja6wwDfHHshZfDuYsEX7bPdk2IanXxFcVRi57Tnfqb2No= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Lf+KX0Pb; arc=none smtp.client-ip=209.85.167.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Lf+KX0Pb" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-540254357c8so2326691e87.1 for ; Fri, 20 Dec 2024 15:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734736746; x=1735341546; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ymxx741lgLNLtEQKC3uZwRUhugqIb22XeDVvOmGI4fE=; b=Lf+KX0PbSut8I9ssZ+X8cHSD3s+dQ0RlLUSJQ5E9tIF7f9NDTSLA8xn0uusHRWK7Nm 5PWAF82g61SiytC9jsIo+sTwOABCqTIeEBKHefLli3M6wj097SGKKVW6PUKVr5XFHSl8 VmJmnY4ywElxBor8jyReJ3OKvxlmrfSVD6upPohoy9I3lJKyY5auPogTPEt9wlonxJ6y Ftsvvo2hJLcwCpmn7HBt0QwcUck8haONUuGSKvbu3RoDIUQCfozLxOCzfuafLMQR9Ih/ Eic2c7J7jNDiYDrqNmE3toZqxaZ0+zhVsFkXpPSnio8mgG45OQN9Ywreie5KSenm4rOc mv2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734736746; x=1735341546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ymxx741lgLNLtEQKC3uZwRUhugqIb22XeDVvOmGI4fE=; b=ZHR94URj54i6Mgqd6GBOuuGmAPr3J1BgZASbZcZAILheOBXbpwwb4Pd/yPT7BBE6kp xQ4GFYTrD4qK8Kq8Y3bhQXniBcES+DWqL+vUBrme+2WEy14a0UFJQBfH31y/mIwhCV4b TO7EkcMSqKbMsMJwKdSlRj0DPWTtB+z4kZaQbqcO3AS/hsUNft+5suU/aUlRW2xcJjug JEf0Jc55ZaLMEOjmR2JkiDhGhgVzK3b4O5/iVbg+W1gDAyPe/2/+r1ddgCRTH70TFVRQ MMDh/wVmb9W8KPrVUYEqKHuGr+vZH/0b027SWY6P7Z+AvnC3REjAQqSqiXSsC5VJsc5a uIGQ== X-Gm-Message-State: AOJu0Yz6GCoWags8UFxRa3WdSszHCoP8OtAr7pKwdPOc5cCKGbV1yyWN hXDTHDdd6K1HRmZ8lr+6RWTU6i0W1F5dluGxhR5T1Qyo/43o7cfHQNcB3A== X-Gm-Gg: ASbGnct0W9vPDQdaWcFaK4ZUXs/4Ps2SEJsq4XkSc5sYBmZdoBquOCmLTlX+MUHxU/S UWvEhv2VPXEkgQptC7l80w/ZxTI1M7jLJ3xMiR8ZFFvWXvUQvwYxWUbwqz9vKDtOwHc1MPKtf2n Ust+EQk0EyEVlU0+HPuUVH7PJvMrsC1OG73hFJZYm5mdyt/RkzU3NAmdCmxPZelA4H83i2sN/lE eHbuufcWXPHL4pY81/5adNlYCbw25A2RBmQwIqZIYVHi0zOaexTYGsbO0vXK40E6V15C2bziSOv hoTkcxmovQknsQOiYbe8LaKt6C6EWJ459VI= X-Google-Smtp-Source: AGHT+IEyhFFxNT973+KOiga1qXbFQL+QMQd/h8IkLIrjmUOuH9GNJOpaVe84GeLDNYOfOvyRdgs8kA== X-Received: by 2002:a05:6512:3054:b0:53e:2f9d:6a7b with SMTP id 2adb3069b0e04-54229524d49mr1587491e87.10.1734736746265; Fri, 20 Dec 2024 15:19:06 -0800 (PST) Received: from localhost.localdomain (81-227-45-223-no2667.tbcn.telia.com. [81.227.45.223]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-542238137f0sm583733e87.164.2024.12.20.15.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 15:19:05 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Patrick Steinhardt Subject: [PATCH 2/3] asciidoctor-extensions.rb.in: add missing word Date: Sat, 21 Dec 2024 00:18:17 +0100 Message-ID: <5ebeff3ed9d3b3ab80cef5c77b1254f6793c59fb.1734734612.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.48.0.rc0.241.g3cddc25e2a In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Commit a38edab7c8 (Makefile: generate doc versions via GIT-VERSION-GEN, 2024-12-06) stopped providing an attribute value "Git $(GIT_VERSION)" to asciidoc/Asciidoctor over the command line. Instead, we now provide the attribute to asciidoc through a generated asciidoc.conf, where the value is generated as "Git @GIT_VERSION@". In the similar mechanism for Asciidoctor, we forgot the "Git" prefix. Restore it. Signed-off-by: Martin Ågren --- Documentation/asciidoctor-extensions.rb.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/asciidoctor-extensions.rb.in b/Documentation/asciidoctor-extensions.rb.in index d8d06f9a57..fd1b84c2be 100644 --- a/Documentation/asciidoctor-extensions.rb.in +++ b/Documentation/asciidoctor-extensions.rb.in @@ -32,7 +32,7 @@ module Git output = output.sub(/.*?<\/refmiscinfo>/, "") output = output.sub(/.*?<\/refmiscinfo>/, "") new_tags = "" \ - "@GIT_VERSION@\n" \ + "Git @GIT_VERSION@\n" \ "Git Manual\n" output = output.sub(/<\/refmeta>/, new_tags + "") end From patchwork Fri Dec 20 23:18:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 13917533 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57022225A50 for ; Fri, 20 Dec 2024 23:19:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734736752; cv=none; b=Ey0FU4VzNqdpbN0becrtka4hvTdtlArPMKa2MwaB1Gjn+T+Ut83JhSwLo2+BWs379NFyQRNycCePVdYOD9zPiSK77n0WRNGK4b3XJ2W2fuU+0abT41CVguDjcBoB13+kLTNcXo9Tk1frtB1/FvMqfsyaPZ0/I7TH8iAyiMYmkWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734736752; c=relaxed/simple; bh=onMYNTSTpi4kf/jFpJvpFldAT7jdfZu+iqwVsCRK1ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uxT0lyjgx/GjEOQqvMVGmdznZxUfpQazfZHz3Z+pncJV/Oq9MGHBthUouMz2nmeZM4ktJICkQmitsbxDFtx/YVdC6KtH8JveUs0MXLJJ35miJv82d/z6zsQf9onolV5MmMiuH29JGl/vdkx1+r1kCuNnj4j2DSsK2fl6MgYaoSM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Eyj5fZLT; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Eyj5fZLT" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5401e6efffcso2863984e87.3 for ; Fri, 20 Dec 2024 15:19:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734736748; x=1735341548; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OlLcZFEfcOt32k9p0DiIdPRUQUpfIH0DMsp6IMJFJcY=; b=Eyj5fZLT1r02DanYy2xmHtgAMRaIV3QY4xUJqEhtaFYn/0B90H6X93/bueiuwwd6Fa /bWvcLGifJXk0ZDpy42pWCAe382oqUnfXjCV5pu3RzqYDzMDKMWEER5JKcq8Dd3Q2wDW 3ofR0qYBKuoHE+A3Kej2b+rBMB7b2WAdzAuf40rIkNC8dZVw9SYJG4dtbCk+d5GtiHsV WBmKHNuQ43GixkEfjqP80GstzAsTcrzPeYyfyHimeDsUrqavUEhgeegsbQoUIUkq2O4w FYht38g9XTkqnrfti8b6k/jWydTP8BjnzqMbl/yvmdn9VDqT/LiEJos4y9o/TWE0CKNe ffDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734736748; x=1735341548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OlLcZFEfcOt32k9p0DiIdPRUQUpfIH0DMsp6IMJFJcY=; b=TWGZGnf3J+ySBxS8ajCrp7WOtABJAfpCAVIk6H38RAr8juaMI+BIcl6vWb0dfYisDr bvceBtlliIWP+/KhdfpngRDJoBrya150Zhy3lNH9yqL22i5cliY1lMaYsTjw1I02guVO Qh5rhajFpRH5iacDv5BwWdlyFL+GKAsv/6cacQlAqzrPFt4HfKaCuueXod/V/CM+p4ah t3gq0X8W9qiqdLTpfBCaUYmiJnvlWlvhThqzAMYOj8SA7WGaXNit/YEa8EQ/qXwAg/Kc gsSFfDpRo7Mc0cczp9hGJ/WXUQNkvbGEuih6pwDj0fTrDj+6ppQEFmZCngSOTn5ogEmd vGJg== X-Gm-Message-State: AOJu0YyIjhzEGJfFv+X94dDunLqShAGc/+q0ANqdP3FRYNu66gZNJZ3E Oi1ZVCNrHMbk1wszq9NWphb6jixNc1zNJzHiAxQNuna3xC7u00EzbkEkLQ== X-Gm-Gg: ASbGnctiSXrzKjoI1pwwuZpaQ3KFB5oeOcgFUrarwAKxP0DPxkXKka30Qyq/26foFtm sYmYDQ5BXAX7EQ8TFYWcSJ9VblGZ9Hr3Iq3IrhzcUGy//OWXm+zw+xbeynnYfCoQzRgabNQKkzP +ThLsWPbZQ8UTzpYfTaNdm3Xlb+SGI/aHQJDHBUvlzUqO9eX8eHGf4hM/LBapzD4BeF9MYijgvf c8gqvdnPXInctVhXDRS4bUaFzd6w8zuSFhI15cwhqtUqT7CIuOVQJoMS8bT3cvHefeD5a6vOoD2 OxRC079klcbsV00vURj4ChZhCn6xwXGNgVU= X-Google-Smtp-Source: AGHT+IF5Aq5c2DlOFW5rlDAfImgxkmtyMZEjyWEEE+pcYN8vox9nHzkH5rdiaE37a99o2xLNVT54Og== X-Received: by 2002:a05:6512:ace:b0:53e:362e:ed6 with SMTP id 2adb3069b0e04-5422959cefbmr1557286e87.50.1734736747969; Fri, 20 Dec 2024 15:19:07 -0800 (PST) Received: from localhost.localdomain (81-227-45-223-no2667.tbcn.telia.com. [81.227.45.223]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-542238137f0sm583733e87.164.2024.12.20.15.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 15:19:07 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Patrick Steinhardt Subject: [PATCH 3/3] asciidoctor-extensions.rb.in: inject GIT_DATE Date: Sat, 21 Dec 2024 00:18:18 +0100 Message-ID: X-Mailer: git-send-email 2.48.0.rc0.241.g3cddc25e2a In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 After a38edab7c8 (Makefile: generate doc versions via GIT-VERSION-GEN, 2024-12-06), we no longer inject GIT_DATE when building with Asciidoctor. Replace the tag in the XML to inject the value of GIT_DATE. Unlike as handled in a recent commit, we have no reason to expect that this tag might be missing, so there's no need for "maybe remove, then add" and we can just outright replace the one that Asciidoctor has generated based on the mtime of the source file. Compared to pre-a38edab7c8, we now end up injecting this also in the build of Git.3pm, which until now has been using the mtime of Git.pm. That is arguably even a good change since it results in more reproducible builds. Signed-off-by: Martin Ågren --- Documentation/asciidoctor-extensions.rb.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/asciidoctor-extensions.rb.in b/Documentation/asciidoctor-extensions.rb.in index fd1b84c2be..2494f17a51 100644 --- a/Documentation/asciidoctor-extensions.rb.in +++ b/Documentation/asciidoctor-extensions.rb.in @@ -31,6 +31,7 @@ module Git if document.basebackend? 'docbook' output = output.sub(/.*?<\/refmiscinfo>/, "") output = output.sub(/.*?<\/refmiscinfo>/, "") + output = output.sub(/.*?<\/date>/, "@GIT_DATE@") new_tags = "" \ "Git @GIT_VERSION@\n" \ "Git Manual\n"