diff options
author | Conley Owens <cco3@android.com> | 2014-10-22 00:23:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-22 00:23:18 +0000 |
commit | 7893b85509c1165d11ad951261aa9f49deb09eea (patch) | |
tree | 24d95c707b9fd0d4e31509e9cf418a7e7828e7ee /git_config.py | |
parent | b4e50e67e84cccd34a9759d2414c7215d657659a (diff) | |
parent | 04e52d616625cc61d897a92d5e9a2c068465f8fc (diff) | |
download | git-repo-7893b85509c1165d11ad951261aa9f49deb09eea.tar.gz |
Merge changes I1f71be22,I5b119f11
* changes:
Always fetch the specific revision given
Support specifying non-HEADS refs as upstream
Diffstat (limited to 'git_config.py')
-rw-r--r-- | git_config.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git_config.py b/git_config.py index aa07d1b7..b4145e8c 100644 --- a/git_config.py +++ b/git_config.py | |||
@@ -619,8 +619,6 @@ class Remote(object): | |||
619 | """ | 619 | """ |
620 | if IsId(rev): | 620 | if IsId(rev): |
621 | return rev | 621 | return rev |
622 | if rev.startswith(R_TAGS): | ||
623 | return rev | ||
624 | 622 | ||
625 | if not rev.startswith('refs/'): | 623 | if not rev.startswith('refs/'): |
626 | rev = R_HEADS + rev | 624 | rev = R_HEADS + rev |
@@ -628,6 +626,10 @@ class Remote(object): | |||
628 | for spec in self.fetch: | 626 | for spec in self.fetch: |
629 | if spec.SourceMatches(rev): | 627 | if spec.SourceMatches(rev): |
630 | return spec.MapSource(rev) | 628 | return spec.MapSource(rev) |
629 | |||
630 | if not rev.startswith(R_HEADS): | ||
631 | return rev | ||
632 | |||
631 | raise GitError('remote %s does not have %s' % (self.name, rev)) | 633 | raise GitError('remote %s does not have %s' % (self.name, rev)) |
632 | 634 | ||
633 | def WritesTo(self, ref): | 635 | def WritesTo(self, ref): |