mirror of
https://github.com/Dev-Wiki/git-repo.git
synced 2025-12-14 08:34:01 +08:00
Change project.revision to revisionExpr and revisionId
The revisionExpr field now holds an expression from the manifest, such as "refs/heads/master", while revisionId holds the current commit-ish SHA-1 of the revisionExpr. Currently that is only filled in if the manifest points directly to a SHA-1. Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
@@ -207,17 +207,14 @@ def _VerifyTag(project):
|
||||
warning: Cannot automatically authenticate repo."""
|
||||
return True
|
||||
|
||||
remote = project.GetRemote(project.remote.name)
|
||||
ref = remote.ToLocal(project.revision)
|
||||
|
||||
try:
|
||||
cur = project.bare_git.describe(ref)
|
||||
cur = project.bare_git.describe(project.GetRevisionId())
|
||||
except GitError:
|
||||
cur = None
|
||||
|
||||
if not cur \
|
||||
or re.compile(r'^.*-[0-9]{1,}-g[0-9a-f]{1,}$').match(cur):
|
||||
rev = project.revision
|
||||
rev = project.revisionExpr
|
||||
if rev.startswith(R_HEADS):
|
||||
rev = rev[len(R_HEADS):]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user