From 9ed920a680ca1999714f287672a31fa862f95e3f Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 13 May 2013 23:36:30 -0500 Subject: 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 Signed-off-by: Junio C Hamano --- contrib/remote-helpers/git-remote-hg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib/remote-helpers/git-remote-hg') 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 -- cgit v1.2.3