ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 21:58:04 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

scripts/kernel_bump: Delete merge commit

Browse Source 
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>
This commit is contained in:
Olliver Schinagl 2024-03-18 14:03:59 +01:00 committed by Robert Marko
parent 71c663bcfd
commit 98235e60ed
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/kernel_bump.sh
View File

@ -171,6 +171,8 @@ bump_kernel()
git switch "${initial_branch:?Unable to switch back to original branch. Quitting.}" git switch "${initial_branch:?Unable to switch back to original branch. Quitting.}"
GIT_EDITOR=true git merge --no-ff '__openwrt_kernel_files_mover' GIT_EDITOR=true git merge --no-ff '__openwrt_kernel_files_mover'
git branch --delete '__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 "Original commitish was '${initial_commitish}'."
echo 'Kernel bump complete. Remember to use `git log --follow`.' echo 'Kernel bump complete. Remember to use `git log --follow`.'