From: Markus Heidelberg <m.heidelberg@cab.de>
To: <ptxdist@pengutronix.de>
Cc: Markus Heidelberg <m.heidelberg@cab.de>
Subject: [ptxdist] [PATCH] ptxd_make_world_patchin_apply_git_init: only invoke rebase helper when needed
Date: Fri, 9 Aug 2024 11:08:17 +0200 [thread overview]
Message-ID: <20240809090817.45817-1-m.heidelberg@cab.de> (raw)
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 <m.heidelberg@cab.de>
---
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
next reply other threads:[~2024-08-09 9:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-09 9:08 Markus Heidelberg [this message]
2024-09-12 12:11 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240809090817.45817-1-m.heidelberg@cab.de \
--to=m.heidelberg@cab.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox