--- a/hgext/convert/git.py	Sun May 09 21:49:57 2010 +0200
+++ b/hgext/convert/git.py	Sun May 09 21:52:34 2010 +0200
@@ -67,10 +67,9 @@
         return data
 
     def getfile(self, name, rev):
-        return self.catfile(rev, "blob")
-
-    def getmode(self, name, rev):
-        return self.modecache[(name, rev)]
+        data = self.catfile(rev, "blob")
+        mode = self.modecache[(name, rev)]
+        return data, mode
 
     def getchanges(self, version):
         self.modecache = {}