From 66252aa89255acf4082bf789f90eebeffb42abcc Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Fri, 19 Apr 2024 21:42:53 -0700 Subject: [PATCH] scripts/kernel_bump: Fix commit text formatting Text of a commit message body should wrap at 75 characters. Manual commits are expected to do so, but automated commits *must* do so to avoid adding repeated ugly commits. Signed-off-by: Tony Ambardar --- scripts/kernel_bump.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kernel_bump.sh b/scripts/kernel_bump.sh index 0a123ea95ab..b1c17d6c397 100755 --- a/scripts/kernel_bump.sh +++ b/scripts/kernel_bump.sh @@ -167,7 +167,7 @@ bump_kernel() git commit \ --signoff \ --message "kernel/${platform_name}: Restore kernel files for v${source_version}" \ - --message "$(printf "This is an automatically generated commit which aids following Kernel patch history,\nas git will see the move and copy as a rename thus defeating the purpose.\n\nSee: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html\nfor the original discussion.")" + --message "$(printf "This is an automatically generated commit which aids following Kernel patch\nhistory, as git will see the move and copy as a rename thus defeating the\npurpose.\n\nFor the original discussion see:\nhttps://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html")" git switch "${initial_branch:?Unable to switch back to original branch. Quitting.}" GIT_EDITOR=true git merge --no-ff '__openwrt_kernel_files_mover' git branch --delete '__openwrt_kernel_files_mover'