Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / 
grub


Commits:
a5b5395f by Christian Hesse at 2025-02-19T11:02:33+01:00
support applying (and reverting) ranges of commits

- - - - -


1 changed file:

- PKGBUILD


Changes:

=====================================
PKGBUILD
=====================================
@@ -150,17 +150,19 @@ prepare() {
   cd "${srcdir}/grub/"
 
   echo "Apply backports..."
-  local _c
+  local _c _l
   for _c in "${_backports[@]}"; do
-    git log --oneline -1 "${_c}"
-    git cherry-pick -n "${_c}"
+    if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
+    git log --oneline "${_l}" "${_c}"
+    git cherry-pick --mainline 1 --no-commit "${_c}"
   done
 
   echo "Apply reverts..."
-  local _c
+  local _c _l
   for _c in "${_reverts[@]}"; do
-    git log --oneline -1 "${_c}"
-    git revert -n "${_c}"
+    if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
+    git log --oneline "${_l}" "${_c}"
+    git revert --mainline 1 --no-commit "${_c}"
   done
 
   echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/a5b5395f7db331393d75464c78e9e19cfdced1be

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/a5b5395f7db331393d75464c78e9e19cfdced1be
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to