From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Sep 2024 14:13:26 +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 1soihT-003mnu-0m for lore@lore.pengutronix.de; Thu, 12 Sep 2024 14:13:26 +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 1soihS-00046x-Cd; Thu, 12 Sep 2024 14:13:26 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1soifk-0001Se-Rn; Thu, 12 Sep 2024 14:11:40 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1soifk-007NQc-F9; Thu, 12 Sep 2024 14:11:40 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1soifk-00BGey-1N; Thu, 12 Sep 2024 14:11:40 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 12 Sep 2024 14:11:40 +0200 Message-Id: <20240912121140.2685638-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240809090817.45817-1-m.heidelberg@cab.de> References: <20240809090817.45817-1-m.heidelberg@cab.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as fa4349755a225c177a9afe7eba294ba301ce6525. Michael [sent from post-receive hook] On Thu, 12 Sep 2024 14:11:40 +0200, Markus Heidelberg wrote: > 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 > Message-Id: <20240809090817.45817-1-m.heidelberg@cab.de> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh > index 8fde0e24c1c8..d13f18d4325c 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 &&