changeset 588:4d9e2d2a2c19 next

Merge
author Augie Fackler <raf@durin42.com>
date Sun, 11 Nov 2012 17:12:55 -0600
parents 24d4741674a6 (current diff) 1ab57b19cb3a (diff)
children 2af1d664f498 2320ab6ada36
files hggit/git_handler.py
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -1023,8 +1023,14 @@
         for tag, sha in self.repo.tags().iteritems():
             if self.repo.tagtype(tag) in ('global', 'git'):
                 tag = tag.replace(' ', '_')
-                self.git.refs['refs/tags/' + tag] = self.map_git_get(hex(sha))
-                self.tags[tag] = hex(sha)
+                target = self.map_git_get(hex(sha))
+                if target is not None:
+                    self.git.refs['refs/tags/' + tag] = target
+                    self.tags[tag] = hex(sha)
+                else:
+                    self.repo.ui.warn(
+                        'Skipping export of tag %s because it '
+                        'has no matching git revision.' % tag)
 
     def _filter_for_bookmarks(self, bms):
         if not self.branch_bookmark_suffix: