##// END OF EJS Templates
fixed bad merge on git fetch fix
marcink -
r3178:a64e663a beta
parent child Browse files
Show More
@@ -606,13 +606,13 b' class GitRepository(BaseRepository):'
606 Tries to pull changes from external location.
606 Tries to pull changes from external location.
607 """
607 """
608 url = self._get_url(url)
608 url = self._get_url(url)
609 so, se = self.run_git_command('ls-remote %s' % url)
609 so, se = self.run_git_command('ls-remote -h %s' % url)
610 refs = []
610 refs = []
611 for line in (x for x in so.splitlines()):
611 for line in (x for x in so.splitlines()):
612 sha, ref = line.split('\t')
612 sha, ref = line.split('\t')
613 refs.append(ref)
613 refs.append(ref)
614 refs = ' '.join(('+%s:%s' % (r, r) for r in refs))
614 refs = ' '.join(('+%s:%s' % (r, r) for r in refs))
615 cmd = '''ls-remote -h %s %s''' % (url, refs)
615 cmd = '''fetch %s -- %s''' % (url, refs)
616 self.run_git_command(cmd)
616 self.run_git_command(cmd)
617
617
618 @LazyProperty
618 @LazyProperty
General Comments 0
You need to be logged in to leave comments. Login now