undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: use remote 'default' not local one

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-05-24 21:29:55 -05:00 committed by Junio C Hamano
parent c2f7a82032
commit b688911a78
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/remote-helpers/git-remote-hg
View File

@ -580,11 +580,11 @@ def get_branch_tip(repo, branch):
def list_head(repo, cur): def list_head(repo, cur):
global g_head, bmarks, fake_bmark global g_head, bmarks, fake_bmark
if 'default' not in repo: if 'default' not in branches:
# empty repo # empty repo
return return
node = repo['default'] node = repo[branch_tip('default')]
head = 'master' if not 'master' in bmarks else 'default' head = 'master' if not 'master' in bmarks else 'default'
fake_bmark = head fake_bmark = head
bmarks[head] = node bmarks[head] = node
@ -601,10 +601,6 @@ def do_list(parser):
bmarks[bmark] = repo[node] bmarks[bmark] = repo[node]
cur = repo.dirstate.branch() cur = repo.dirstate.branch()
list_head(repo, cur)
if track_branches:
orig = peer if peer else repo orig = peer if peer else repo
for branch, heads in orig.branchmap().iteritems(): for branch, heads in orig.branchmap().iteritems():
@ -613,6 +609,9 @@ def do_list(parser):
if heads: if heads:
branches[branch] = heads branches[branch] = heads
list_head(repo, cur)
if track_branches:
for branch in branches: for branch in branches:
print "? refs/heads/branches/%s" % gitref(branch) print "? refs/heads/branches/%s" % gitref(branch)

2
contrib/remote-helpers/test-hg.sh
View File

@ -486,7 +486,7 @@ test_expect_success 'remote big push' '
check_bookmark hgrepo new_bmark '' check_bookmark hgrepo new_bmark ''
' '
test_expect_failure 'remote double failed push' ' test_expect_success 'remote double failed push' '
test_when_finished "rm -rf hgrepo gitrepo*" && test_when_finished "rm -rf hgrepo gitrepo*" &&
( (