From edac7b7533d50455baaaf05a46b7ace49bb24b95 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 23 Sep 2015 15:34:53 -0700 Subject: [PATCH] toaster: don't use --single-branch when cloning git clone --single-branch works only with ref names. It fails if commit sha1 is set in layer configuration with this error: fatal: Remote branch not found in upstream origin Cloning repository without using --single-branch should work for refs and commit sha1. [YOCTO #7505] Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- lib/toaster/bldcontrol/localhostbecontroller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index 62fff1da34a..e2d9375d318 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/lib/toaster/bldcontrol/localhostbecontroller.py @@ -262,8 +262,8 @@ class LocalhostBEController(BuildEnvironmentController): self._shellcmd("git remote remove origin", localdirname) self._shellcmd("git remote add origin \"%s\"" % giturl, localdirname) else: - logger.debug("localhostbecontroller: cloning %s:%s in %s" % (giturl, commit, localdirname)) - self._shellcmd("git clone \"%s\" --single-branch --branch \"%s\" \"%s\"" % (giturl, commit, localdirname)) + logger.debug("localhostbecontroller: cloning %s in %s" % (giturl, localdirname)) + self._shellcmd('git clone "%s" "%s"' % (giturl, localdirname)) # branch magic name "HEAD" will inhibit checkout if commit != "HEAD": -- 2.47.3