Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

patman: fix use in worktree

Browse Source 
When using a worktree '.git' actually is a file and pygit2
init_repository() does not like that. The intention is not to create
a new git repo anyway so use normal constructor instead of
init_repository().

Signed-off-by: Ludwig Nussel <ludwig.nussel@siemens.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Ludwig Nussel
2026-04-29 14:18:51 +02:00
committed by Simon Glass
parent 3d09ec64eb
commit 49fc812eb4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/patman/cser_helper.py
View File

@@ -309,7 +309,7 @@ class CseriesHelper:
self._copy_db_fields_to(series, ser)
msg = None
if end:
repo = pygit2.init_repository(self.gitdir)
repo = pygit2.Repository(self.gitdir)
target = repo.revparse_single(end)
first_line = target.message.splitlines()[0]
msg = f'Ending before {oid(target.id)} {first_line}'
@@ -725,7 +725,7 @@ class CseriesHelper:
raise ValueError(
f"Modified files exist: use 'git status' to check: "
f'{dirty[:5]}')
repo = pygit2.init_repository(self.gitdir)
repo = pygit2.Repository(self.gitdir)
commit = None
upstream_name = None

6
tools/patman/cseries.py
View File

@@ -119,7 +119,7 @@ class Cseries(cser_helper.CseriesHelper):
new_max = max_vers - 1
repo = pygit2.init_repository(self.gitdir)
repo = pygit2.Repository(self.gitdir)
if not dry_run:
name = self._get_branch_name(ser.name, new_max)
branch = repo.lookup_branch(name)
@@ -859,7 +859,7 @@ class Cseries(cser_helper.CseriesHelper):
tag_info[svi.version] = [svi.idnum, name, f'{name}-{now_str}']
# Create the tags
repo = pygit2.init_repository(self.gitdir)
repo = pygit2.Repository(self.gitdir)
for _, (idnum, name, tag_name) in tag_info.items():
commit = repo.revparse_single(name)
repo.create_tag(tag_name, commit.hex,
@@ -896,7 +896,7 @@ class Cseries(cser_helper.CseriesHelper):
svlist = self.db.ser_ver_get_for_series(ser.idnum)
# Collect the tags
repo = pygit2.init_repository(self.gitdir)
repo = pygit2.Repository(self.gitdir)
tag_info = {}
for svi in svlist:
name = self._get_branch_name(ser.name, svi.version)