From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 09 Aug 2024 11:09:04 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1scLcO-007meE-1G for lore@lore.pengutronix.de; Fri, 09 Aug 2024 11:09:04 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1scLcN-00022t-AR; Fri, 09 Aug 2024 11:09:03 +0200 Received: from mail.cab.de ([213.144.1.196]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1scLbz-00022j-Fy for ptxdist@pengutronix.de; Fri, 09 Aug 2024 11:08:40 +0200 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.cab.de 4WgJ465bcQzMvb0J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cab.de; s=default; t=1723194518; bh=v65dsFoz8b2S5S6Ng1m3TxW5MdVQOQDta4TKIxwXOUw=; h=From:To:CC:Subject:Date:From; b=aDMhi+G/tXnYx+FacBdfO4SyCJazA+/GLbCyszSisrfdt3tF1bRdSO3fgS4XXnh7J cjCov4iYqv54VEPfUbCTxpUe/ImJAyK2mq4igiq4RWlyb0xlq1TFIbO3eCH9EiOsO/ SnEz8pbNi9IqLngw1CEzXlSemU+5MeLR1MVjk5l0= X-cab-MailScanner-Watermark: 1723799317.66824@W0WBIN+/vZllSAyWR8pGtg X-cab-MailScanner-From: m.heidelberg@cab.de X-cab-MailScanner: Found to be clean X-cab-MailScanner-ID: 4WgJ445y7BzMvb0J X-cab-MailScanner-Information: Please contact it@cab.de for more information Received: from Adranos.cab.de ([10.10.1.54] [10.10.1.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (no client certificate requested) by hephaistos.cab.de (MailScanner Milter) with SMTP id 4WgJ445y7BzMvb0J for ; Fri, 9 Aug 2024 11:08:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.cab.de 4WgJ445y7BzMvb0J Received: from KAN23-025.cab.de (10.100.0.7) by Adranos.cab.de (10.10.1.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 9 Aug 2024 11:08:35 +0200 From: Markus Heidelberg To: Date: Fri, 9 Aug 2024 11:08:17 +0200 Message-ID: <20240809090817.45817-1-m.heidelberg@cab.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.100.0.7] X-ClientProxiedBy: Adranos.cab.de (10.10.1.54) To Adranos.cab.de (10.10.1.54) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] ptxd_make_world_patchin_apply_git_init: only invoke rebase helper when needed X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Markus Heidelberg Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Originally it was only invoked during interactive rebase, but the needed git config variable sequence.editor had been accidentally reverted to the previous state core.editor in commit f4d2f09da9df ("ptxd_make_world_patchin: Allow git-ptx-* scripts to be overwritten", 2023-06-19), so it was always invoked before the normal user editor. Since the helper script "git-ptx-refresh-tags-editor" mangles whitespace, e.g. the "e" command of "git add --patch" for manually editing hunks didn't work anymore because the patch opened in the editor was corrupt. Signed-off-by: Markus Heidelberg --- scripts/lib/ptxd_make_world_patchin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh index 8fde0e24c..d13f18d43 100644 --- a/scripts/lib/ptxd_make_world_patchin.sh +++ b/scripts/lib/ptxd_make_world_patchin.sh @@ -79,7 +79,7 @@ ptxd_make_world_patchin_apply_git_init() __git tag "${pkg_pkg//\~/-}" && __git tag base && __git config alias.ptx-patches "!${git_ptx_patches} \"\${@}\"" && - __git config core.editor "${git_ptx_refresh_tags_editor}" && + __git config sequence.editor "${git_ptx_refresh_tags_editor}" && __git config diff.renames false && __git config core.abbrev 12 && __git config core.autocrlf false && -- 2.34.1