Mercurial > hg
changeset 13466:f2295f7cd468 stable
subrepo: only attempt pulling from git's origin
git fetch does not accept repository URLs as arguments, and the intended
logic of this code was not actually doing anything.
| author | Eric Eisner <ede@mit.edu> |
|---|---|
| date | Wed, 23 Feb 2011 10:59:36 -0500 |
| parents | fa88fabc1d66 |
| children | 31aa2e5b0750 |
| files | mercurial/subrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Wed Feb 23 10:17:44 2011 -0500 +++ b/mercurial/subrepo.py Wed Feb 23 10:59:36 2011 -0500 @@ -764,12 +764,8 @@ if self._githavelocally(revision): return self._ui.status(_('pulling subrepo %s\n') % self._relpath) - # first try from origin + # try only origin: the originally cloned repo self._gitcommand(['fetch']) - if self._githavelocally(revision): - return - # then try from known subrepo source - self._gitcommand(['fetch', self._abssource(source)]) if not self._githavelocally(revision): raise util.Abort(_("revision %s does not exist in subrepo %s\n") % (revision, self._relpath))