Merge branch 'jk/utf-8-can-be-spelled-differently'
[gitweb.git] / git_remote_helpers / git / importer.py
index e28cc8f98655b16e5930c9c623a1f3098ae0ca93..d3f90e1024a1b3ac8e7b4204b873e0ac2fffeaf9 100644 (file)
@@ -18,13 +18,16 @@ def __init__(self, repo):
 
     def get_refs(self, gitdir):
         """Returns a dictionary with refs.
+
+        Note that the keys in the returned dictionary are byte strings as
+        read from git.
         """
         args = ["git", "--git-dir=" + gitdir, "for-each-ref", "refs/heads"]
-        lines = check_output(args).strip().split('\n')
+        lines = check_output(args).strip().split('\n'.encode('ascii'))
         refs = {}
         for line in lines:
-            value, name = line.split(' ')
-            name = name.strip('commit\t')
+            value, name = line.split(' '.encode('ascii'))
+            name = name.strip('commit\t'.encode('ascii'))
             refs[name] = value
         return refs