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 <[email protected]> --- 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
