Mercurial > kallithea

changeset 3178:a64e663abda3 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed bad merge on git fetch fix
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 20 Jan 2013 23:17:45 +0100
parents 48a18391f6da
children cd50d1b5f35b 3472d8f37e6d
files rhodecode/lib/vcs/backends/git/repository.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/vcs/backends/git/repository.py	Sun Jan 20 22:40:28 2013 +0100
+++ b/rhodecode/lib/vcs/backends/git/repository.py	Sun Jan 20 23:17:45 2013 +0100
@@ -606,13 +606,13 @@
         Tries to pull changes from external location.
         """
         url = self._get_url(url)
-        so, se = self.run_git_command('ls-remote %s' % url)
+        so, se = self.run_git_command('ls-remote -h %s' % url)
         refs = []
         for line in (x for x in so.splitlines()):
             sha, ref = line.split('\t')
             refs.append(ref)
         refs = ' '.join(('+%s:%s' % (r, r) for r in refs))
-        cmd = '''ls-remote -h %s %s''' % (url, refs)
+        cmd = '''fetch %s -- %s''' % (url, refs)
         self.run_git_command(cmd)
 
     @LazyProperty