diff mbox series

devtool: upgrade: do not add dummy git notes

Message ID 20260219120521.218506-1-alex.kanavin@gmail.com
State Under Review
Headers show
Series devtool: upgrade: do not add dummy git notes | expand

Commit Message

Alexander Kanavin Feb. 19, 2026, 12:05 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

This has been causing a significant performance regression,
to the point where AUH wasn't able to complete upgrades with
particularly large number of git commits between releases [1].

After discussing with Peter [2], running 'oe-selftest -r devtool' with this change (100% pass),
and also doing an AUH run with it, and reviewing the output I think this is fine to remove:
the case is either very niche or non-existent, and if it appears again, we
should come up with a better fix.

[1] https://autobuilder.yoctoproject.org/valkyrie/#/builders/38/builds/54/steps/15/logs/stdio
[2] https://lists.openembedded.org/g/openembedded-core/message/231281

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 scripts/lib/devtool/upgrade.py | 15 ---------------
 1 file changed, 15 deletions(-)
diff mbox series

Patch

diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index dda0a58098..8930fde5d6 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -275,16 +275,6 @@  def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
             branches_to_rebase = [branch] + stdout.split()
             target_branch = revs[os.path.relpath(path, srctree)]
 
-            # There is a bug (or feature?) in git rebase where if a commit with
-            # a note is fully rebased away by being part of an old commit, the
-            # note is still attached to the old commit. Avoid this by making
-            # sure all old devtool related commits have a note attached to them
-            # (this assumes git config notes.rewriteMode is set to ignore).
-            (stdout, _) = _run('git rev-list devtool-base..%s' % target_branch, cwd=path)
-            for rev in stdout.splitlines():
-                if not oe.patch.GitApplyTree.getNotes(path, rev):
-                    oe.patch.GitApplyTree.addNote(path, rev, "dummy")
-
             for b in branches_to_rebase:
                 logger.info("Rebasing {} onto {}".format(b, target_branch))
                 _run('git checkout %s' % b, cwd=path)
@@ -297,11 +287,6 @@  def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
                     else:
                         logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
 
-            # Remove any dummy notes added above.
-            (stdout, _) = _run('git rev-list devtool-base..%s' % target_branch, cwd=path)
-            for rev in stdout.splitlines():
-                oe.patch.GitApplyTree.removeNote(path, rev, "dummy")
-
             _run('git checkout %s' % branch, cwd=path)
 
     if tmpsrctree: