--- a/mercurial/subrepo.py Tue Oct 11 17:20:03 2011 -0500
+++ b/mercurial/subrepo.py Tue Oct 11 21:34:55 2011 -0700
@@ -833,9 +833,10 @@
for b in branches:
if b.startswith('refs/remotes/'):
continue
- remote = self._gitcommand(['config', 'branch.%s.remote' % b])
+ bname = b.split('/', 2)[2]
+ remote = self._gitcommand(['config', 'branch.%s.remote' % bname])
if remote:
- ref = self._gitcommand(['config', 'branch.%s.merge' % b])
+ ref = self._gitcommand(['config', 'branch.%s.merge' % bname])
tracking['refs/remotes/%s/%s' %
(remote, ref.split('/', 2)[2])] = b
return tracking