Mercurial > hg > hg-git

changeset 617:1d326a57e2dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git-handler: turn refs from None to {} so that empty git repos can convert
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Tue, 03 Dec 2013 16:55:17 -0500
parents 503d403fc040
children 949ec5b7d47f
files hggit/git_handler.py tests/test-clone.t
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -1017,7 +1017,11 @@
                 f.seek(0)
                 po =  self.git.object_store.add_thin_pack(f.read, None)
             progress.flush()
-            return ret
+
+            # For empty repos dulwich gives us None, but since later
+            # we want to iterate over this, we really want an empty
+            # iterable
+            return ret if ret else {}
         except (HangupException, GitProtocolError), e:
             raise hgutil.Abort(_("git remote error: ") + str(e))
 
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -50,3 +50,11 @@
      date:        Mon Jan 01 00:00:10 2007 +0000
      summary:     add alpha
   
+
+clone empty repo
+  $ git init empty
+  Initialized empty Git repository in $TESTTMP/empty/.git/
+  $ hg clone empty emptyhg
+  no changes found
+  updating to branch default
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved