summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-22 15:35:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-23 00:03:06 +0000
commitc996cfea529e6ec3fa6d511ed75694db9a3a2fd3 (patch)
tree13f2888b8927d8c6ba89260d9c57a2e934c33f14 /bitbake/lib
parent3fb215a3af242e2016a146739a69be746ab8b722 (diff)
downloadpoky-c996cfea529e6ec3fa6d511ed75694db9a3a2fd3.tar.gz
bitbake: tests/fetch: Fix git shallow test failure with git >= 2.48
From git 2.48 release notes: """ When "git fetch $remote" notices that refs/remotes/$remote/HEAD is missing and discovers what branch the other side points with its HEAD, refs/remotes/$remote/HEAD is updated to point to it. """ This means with git 2.48 onwards, there is a mystery "HEAD" revision appearing in some of our shallow clone tests. We can avoid this by using the same canonicalization as used for the reference revisions. This resolves autobuilder failures on the Fedora 40 workers. (Bitbake rev: c83444d1210740e27b1744d3aa7c5cad4e28db2f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/tests/fetch.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 6b8e3e060f..d647170112 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -1739,6 +1739,8 @@ class GitShallowTest(FetcherTest):
1739 if cwd is None: 1739 if cwd is None:
1740 cwd = self.gitdir 1740 cwd = self.gitdir
1741 actual_refs = self.git(['for-each-ref', '--format=%(refname)'], cwd=cwd).splitlines() 1741 actual_refs = self.git(['for-each-ref', '--format=%(refname)'], cwd=cwd).splitlines()
1742 # Resolve references into the same format as the comparision (needed by git 2.48 onwards)
1743 actual_refs = self.git(['rev-parse', '--symbolic-full-name'] + actual_refs, cwd=cwd).splitlines()
1742 full_expected = self.git(['rev-parse', '--symbolic-full-name'] + expected_refs, cwd=cwd).splitlines() 1744 full_expected = self.git(['rev-parse', '--symbolic-full-name'] + expected_refs, cwd=cwd).splitlines()
1743 self.assertEqual(sorted(set(full_expected)), sorted(set(actual_refs))) 1745 self.assertEqual(sorted(set(full_expected)), sorted(set(actual_refs)))
1744 1746