From 841b37b6263967e77d9055a20728f2f7cebfcb7f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Mar 2008 17:19:49 +0000 Subject: bitbake: Fix a bug where changed files weren't getting spotted and an invalid cache was being used git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4148 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/lib/bb/fetch/git.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/fetch/git.py') diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 0c708e3516..f4ae724f87 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/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) -- cgit 1.2.3-korg