From patchwork Sat Aug 18 15:18:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] fetch2/git: Work around git confusion between foo.git and foo repositories Date: Sat, 18 Aug 2012 15:18:03 -0000 From: Richard Purdie X-Patchwork-Id: 34877 Message-Id: <1345303083.27428.56.camel@ted> To: bitbake-devel Cc: "Ashfield, Bruce" , "saul.wold" If you have foo and foo.git in GITDIR, the two can end up being confused by git with some horrible union of the two being cloned. This adds a workaround to avoid this happening until git 1.7.9.2 onwards is common enough for this to be removed. We use a symlink to hide the directories we don't want git to know about. Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 384007c..af7c623 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -245,7 +245,22 @@ class Git(FetchMethod): if ud.bareclone: cloneflags += " --mirror" - runfetchcmd("git clone %s %s/ %s" % (cloneflags, ud.clonedir, destdir), d) + # Versions of git prior to 1.7.9.2 have issues where foo.git and foo get confused + # and you end up with some horrible union of the two when you attempt to clone it + # The least invasive workaround seems to be a symlink to the real directory to + # fool git into ignoring any .git version that may also be present. + # + # The issue is fixed in more recent versions of git so we can drop this hack in future + # when that version becomes common enough. + clonedir = ud.clonedir + if not ud.path.endswith(".git"): + indirectiondir = destdir[:-1] + ".indirectionsymlink" + if os.path.exists(indirectiondir): + os.remove(indirectiondir) + os.symlink(ud.clonedir, indirectiondir) + clonedir = indirectiondir + + runfetchcmd("git clone %s %s/ %s" % (cloneflags, clonedir, destdir), d) if not ud.nocheckout: os.chdir(destdir) if subdir != "":