Mercurial > hg-git

diff hggit/git_handler.py @ 700:e29e280776ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update_hg_bookmarks: don't update bookmarks that don't have an hg commit Still more bugs to fix.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 04 Mar 2014 14:50:44 -0800
parents a72816ade410
children 178b15457927
line wrap: on
line diff
--- a/hggit/git_handler.py	Tue Mar 04 14:39:50 2014 -0800
+++ b/hggit/git_handler.py	Tue Mar 04 14:50:44 2014 -0800
@@ -1126,9 +1126,10 @@
             for head, sha in heads.iteritems():
                 # refs contains all the refs in the server, not just
                 # the ones we are pulling
-                if sha not in self.git.object_store:
+                hgsha = self.map_hg_get(sha)
+                if hgsha is None:
                     continue
-                hgsha = bin(self.map_hg_get(sha))
+                hgsha = bin(hgsha)
                 if not head in bms:
                     # new branch
                     bms[head + suffix] = hgsha