summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
Diffstat (limited to 'project.py')
-rw-r--r--project.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/project.py b/project.py
index 2ab0b389..e777dbd2 100644
--- a/project.py
+++ b/project.py
@@ -1216,7 +1216,7 @@ class Project(object):
1216 (self.revisionExpr, self.name)) 1216 (self.revisionExpr, self.name))
1217 1217
1218 def SetRevisionId(self, revisionId): 1218 def SetRevisionId(self, revisionId):
1219 if self.clone_depth or self.manifest.manifestProject.config.GetString('repo.depth'): 1219 if self.revisionExpr:
1220 self.upstream = self.revisionExpr 1220 self.upstream = self.revisionExpr
1221 1221
1222 self.revisionId = revisionId 1222 self.revisionId = revisionId
@@ -1967,6 +1967,10 @@ class Project(object):
1967 # throws an error. 1967 # throws an error.
1968 self.bare_git.rev_list('-1', '--missing=allow-any', 1968 self.bare_git.rev_list('-1', '--missing=allow-any',
1969 '%s^0' % self.revisionExpr, '--') 1969 '%s^0' % self.revisionExpr, '--')
1970 if self.upstream:
1971 rev = self.GetRemote(self.remote.name).ToLocal(self.upstream)
1972 self.bare_git.rev_list('-1', '--missing=allow-any',
1973 '%s^0' % rev, '--')
1970 return True 1974 return True
1971 except GitError: 1975 except GitError:
1972 # There is no such persistent revision. We have to fetch it. 1976 # There is no such persistent revision. We have to fetch it.