repos: git: Always replicate refs/ into local branches on checkout
If a refspec addresses an upstream branch which commit happens to be local already, checkout will not properly replicate that into a local branch. Extend contains_refspec_cmd so that it does not falsely report the remotes/origin/ ref as locally available and rather triggers its fetching. The related test case was papering over this issue so far. Adjust it accordingly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
@@ -420,7 +420,10 @@ class GitRepo(RepoImpl):
|
||||
'-m', 'msg']
|
||||
|
||||
def contains_refspec_cmd(self):
|
||||
return ['git', 'cat-file', '-t', self.remove_ref_prefix(self.refspec)]
|
||||
refspec = self.refspec
|
||||
if refspec and refspec.startswith('refs/'):
|
||||
refspec = 'remotes/origin/' + self.remove_ref_prefix(refspec)
|
||||
return ['git', 'cat-file', '-t', refspec]
|
||||
|
||||
def fetch_cmd(self):
|
||||
cmd = ['git', 'fetch', '-q']
|
||||
|
Reference in New Issue
Block a user