From: Olliver Schinagl <oliver@schinagl.nl>
Date: Mon, 18 Mar 2024 13:03:59 +0000 (+0100)
Subject: scripts/kernel_bump: Delete merge commit
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=98235e60ed8436ca9476c3bc84a8f1feb553a764;p=openwrt%2Fstaging%2Fthess.git

scripts/kernel_bump: Delete merge commit

While we have included the needed changes via a merge commit, there is
no need to keep it. Lets drop the merge commit, which we can do as we
haven't pushed anything.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
---

diff --git a/scripts/kernel_bump.sh b/scripts/kernel_bump.sh
index 1a6e5e5ea7..0a123ea95a 100755
--- a/scripts/kernel_bump.sh
+++ b/scripts/kernel_bump.sh
@@ -171,6 +171,8 @@ bump_kernel()
 	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'
+	echo "Deleting merge commit ($(git rev-parse HEAD))."
+	git rebase HEAD~1
 
 	echo "Original commitish was '${initial_commitish}'."
 	echo 'Kernel bump complete. Remember to use `git log --follow`.'