SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repos: git: Strip of heads/ prefix when checking out branches

Browse Source 
If a remote branch is referenced as refs/heads/<branch>, also drop the
heads/ from the local branch name to have a consistent naming.

This wasn't noticed so far because the primary use case of refs/ is
addressing symbolic refs in upstream, and the related test case
(test_refspec_absolute) was papering over another hidden kas issues
while using refs/heads/.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2023-05-29 08:11:39 +02:00
parent a317a0e957
commit 420bf399b3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kas/repos.py
View File

@ -443,7 +443,9 @@ class GitRepo(RepoImpl):
def checkout_cmd(self, desired_ref, is_branch): def checkout_cmd(self, desired_ref, is_branch):
cmd = ['git', 'checkout', '-q', self.remove_ref_prefix(desired_ref)] cmd = ['git', 'checkout', '-q', self.remove_ref_prefix(desired_ref)]
if is_branch: if is_branch:
cmd.extend(['-B', self.remove_ref_prefix(self.refspec)]) branch = self.remove_ref_prefix(self.refspec)
branch = branch[branch.startswith('heads/') and len('heads/'):]
cmd.extend(['-B', branch])
if get_context().force_checkout: if get_context().force_checkout:
cmd.append('--force') cmd.append('--force')
return cmd return cmd