Mercurial > hg > hg-git
comparison hggit/git_handler.py @ 862:f34e1dc7314c
git_handler: Fix extra bookmark created after pushed to empty remote repo.
author | Paul Chen <lancevdance@gmail.com> |
---|---|
date | Sat, 21 Feb 2015 14:49:43 +0800 |
parents | 89bfb9994732 |
children | 9036716a1271 |
comparison
equal
deleted
inserted
replaced
861:cdf46071a83f | 862:f34e1dc7314c |
---|---|
981 tip = self.repo.lookup('tip') | 981 tip = self.repo.lookup('tip') |
982 if tip != nullid: | 982 if tip != nullid: |
983 del new_refs['capabilities^{}'] | 983 del new_refs['capabilities^{}'] |
984 tip = hex(tip) | 984 tip = hex(tip) |
985 try: | 985 try: |
986 commands.bookmark(self.ui, self.repo, 'master', tip, force=True) | 986 commands.bookmark(self.ui, self.repo, 'master', rev=tip, force=True) |
987 except NameError: | 987 except NameError: |
988 bookmarks.bookmark(self.ui, self.repo, 'master', tip, force=True) | 988 bookmarks.bookmark(self.ui, self.repo, 'master', rev=tip, force=True) |
989 bookmarks.setcurrent(self.repo, 'master') | 989 bookmarks.setcurrent(self.repo, 'master') |
990 new_refs['refs/heads/master'] = self.map_git_get(tip) | 990 new_refs['refs/heads/master'] = self.map_git_get(tip) |
991 | 991 |
992 for rev, rev_refs in exportable.iteritems(): | 992 for rev, rev_refs in exportable.iteritems(): |
993 ctx = self.repo[rev] | 993 ctx = self.repo[rev] |