From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 14 May 2013 04:36:30 +0000 (-0500)
Subject: remote-hg: don't push fake 'master' bookmark
X-Git-Tag: v1.8.3-rc3~10^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ed920a680ca1999714f287672a31fa862f95e3f;p=thirdparty%2Fgit.git

remote-hg: don't push fake 'master' bookmark

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

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 53412dd91f..beb864b57e 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -873,7 +873,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