bitbake/fetch2/git: Ensure unresolved branches are translated into revisions

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 6bcc4a483857f03bb35c132394f780733f062c59..f05a360f189c8f32116c387b55cc8609de552d71 100644 (file)
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -72,7 +72,8 @@ class Git(FetchMethod):
         ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
 
         for name in ud.names:
-            if not ud.revisions[name] or ud.revisions[name] == "master":
+            # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one
+            if not ud.revisions[name] or len(ud.revisions[name]) != 40  or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
                 ud.revisions[name] = self.latest_revision(url, ud, d, name)
 
         ud.localfile = ud.clonedir