[PATCH v2 2/6] remote-hg: don't push fake 'master' bookmark

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

May 10, 2013, 20:59 UTC

Message-ID

<1368219566-1399-3-git-send-email-felipe.contreras@gmail.com>

In-Reply-To

<1368219566-1399-1-git-send-email-felipe.contreras@gmail.com>

We skip it locally, but not for the remote, so let's do so.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 84901e9..14e7395 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -867,7 +867,8 @@ def do_export(parser):
 
         if bmark == 'master' and 'master' not in parser.repo._bookmarks:
             # fake bookmark
-            pass
+            print "ok %s" % ref
+            continue
         elif bookmarks.pushbookmark(parser.repo, bmark, old, new):
             # updated locally
             pass

-- 
1.8.3.rc1.579.g184e698