summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-13 23:36:30 -0500
committerJunio C Hamano <gitster@pobox.com>2013-05-15 12:40:59 -0700
commit9ed920a680ca1999714f287672a31fa862f95e3f (patch)
treecf3adcee07fcc281241ec5e79563a3b6b949d950
parent06f42133550725d360c9b6acc3b3fa223fee6c47 (diff)
downloadgit-9ed920a680ca1999714f287672a31fa862f95e3f.tar.gz
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>
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg3
1 files changed, 2 insertions, 1 deletions
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