diff mbox series

[yocto-autobuilder-helper,3/4] scripts/run-docs-build: use git apply to apply patches

Message ID 20260223-fix-switchers-js-ydocs-v1-3-6f58a78ee8c3@bootlin.com
State New
Headers show
Series Adaptation for the new yocto-docs switcher menu | expand

Commit Message

Antonin Godard Feb. 23, 2026, 11:03 a.m. UTC 
Since we're now using set_versions.py from every tag, if we use git
am it creates a new commit and so we do not point on the tag anymore.
Use git apply instead so that our HEAD does not move.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 scripts/run-docs-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/scripts/run-docs-build b/scripts/run-docs-build
index 924b446..fed5e61 100755
--- a/scripts/run-docs-build
+++ b/scripts/run-docs-build
@@ -196,7 +196,7 @@  for branch in "$ypdocsbranch" dunfell $(git branch --remote --contains "$first_s
 
     if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then
         echo Adding patch for $branch
-        git am "${scriptdir}/docs-build-patches/${branch}/"000*
+        git apply -3 "${scriptdir}/docs-build-patches/${branch}/"000*
     fi
 
     git checkout origin/master sphinx-static/switchers.js.in set_versions.py