summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-05-13 23:36:31 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-15 12:41:13 -0700
commit24317ef32ac3111ed00792f9b2921dc19dd28fe2 (patch)
tree73f93b00810c59d58a44ec0a9191406bd0e13731
parentremote-hg: don't push fake 'master' bookmark (diff)
downloadtgif-24317ef32ac3111ed00792f9b2921dc19dd28fe2.tar.xz
remote-hg: update bookmarks when pulling
Otherwise, the user would never ever see new bookmarks, only the ones that (s)he initially cloned. 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, 3 insertions, 0 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index beb864b57e..dc276afb1b 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -363,6 +363,9 @@ def get_repo(url, alias):
die('Repository error')
repo.pull(peer, heads=None, force=True)
+ rb = peer.listkeys('bookmarks')
+ bookmarks.updatefromremote(myui, repo, rb, url)
+
return repo
def rev_to_mark(rev):