changeset 248:bfe6fd2fdb9b

push tip to master in an empty repository even if there are tags (closes issue 11 bb)
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Sun, 16 Aug 2009 23:18:08 +0100
parents 3c01e07b0252
children 93900665c4da ff2d4f541ae9
files git_handler.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/git_handler.py
+++ b/git_handler.py
@@ -539,12 +539,13 @@
         new_refs = refs.copy()
 
         #The remote repo is empty and the local one doesn't have bookmarks/tags
-        if not revs and refs.keys()[0] == 'capabilities^{}':
+        if refs.keys()[0] == 'capabilities^{}':
             del new_refs['capabilities^{}']
-            tip = hex(self.repo.lookup('tip'))
-            bookmarks.bookmark(self.ui, self.repo, 'master', tip)
-            new_refs['refs/heads/master'] = self.map_git_get(tip)
-            return new_refs
+            if not self.local_heads():
+                tip = hex(self.repo.lookup('tip'))
+                bookmarks.bookmark(self.ui, self.repo, 'master', tip)
+                bookmarks.setcurrent(self.repo, 'master')
+                new_refs['refs/heads/master'] = self.map_git_get(tip)
 
         for rev in revs:
             ctx = self.repo[rev]