summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-20 14:23:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-21 10:20:14 +0000
commitc81d3ad1e3e3cc4cb18ca520b49c147edae23cd8 (patch)
tree5c43eadcab82aa969cbd69ff8966ecb845cb60aa
parentd21c1537b7052aa24ec56434b821fee67de33a83 (diff)
downloadpoky-c81d3ad1e3e3cc4cb18ca520b49c147edae23cd8.tar.gz
bitbake: fetch2/git: Dereference unresolved tags with ls-remote
We need to deference tags when trying to map them to commit IDs with ls-remote. If we don't do this, a given commit might not show up later in a specific branch. There appears to be no good reason not to do this. (Bitbake rev: 8ef24f4c834298348172b96ec0b855bf09552b09) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index d73f0cbecf..f7c26b36cc 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -326,7 +326,7 @@ class Git(FetchMethod):
326 else: 326 else:
327 username = "" 327 username = ""
328 328
329 cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s" % \ 329 cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s^{}" % \
330 (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.unresolvedrev[name], ud.unresolvedrev[name]) 330 (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.unresolvedrev[name], ud.unresolvedrev[name])
331 if ud.proto.lower() != 'file': 331 if ud.proto.lower() != 'file':
332 bb.fetch2.check_network_access(d, cmd) 332 bb.fetch2.check_network_access(d, cmd)