aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/fetch/git.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4adc20ae5..818f16a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,6 +122,7 @@ Changes in Bitbake 1.9.x:
- Fix problems with recrdeptask handling where some idepends weren't handled
correctly.
- Handle exit codes correctly (from pH5)
+ - Work around refs/HEAD issues with git over http (#3410)
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/fetch/git.py b/lib/bb/fetch/git.py
index 0c708e351..f4ae724f8 100644
--- a/lib/bb/fetch/git.py
+++ b/lib/bb/fetch/git.py
@@ -50,7 +50,7 @@ class Git(Fetch):
if 'protocol' in ud.parm:
ud.proto = ud.parm['protocol']
- ud.branch = ud.parm.get("branch", "")
+ ud.branch = ud.parm.get("branch", "master")
tag = Fetch.srcrev_internal_helper(ud, d)
if tag is True:
@@ -95,7 +95,7 @@ class Git(Fetch):
os.chdir(repodir)
# Remove all but the .git directory
runfetchcmd("rm * -Rf", d)
- runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d)
+ runfetchcmd("git fetch %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d)
runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
runfetchcmd("git prune-packed", d)
runfetchcmd("git pack-redundant --all | xargs -r rm", d)