diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-04-05 03:35:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-05 15:48:11 +0100 |
commit | 6140d0cc9aecf1029ca16fed47071dfcc92f4269 (patch) | |
tree | 3dd16b785bc9c53da32f22e0e4e6f5de6a63b431 | |
parent | 09623a0811c613a47a01ae465b822d8156faca30 (diff) | |
download | openembedded-core-contrib-6140d0cc9aecf1029ca16fed47071dfcc92f4269.tar.gz |
fetch2/git.py: remove .indirectiondir workaround
It was used for workaround git 1.7.9.2 which was released in 2012 which
should not be existed on nowadays host, so remove it to avoid
confusions.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/git.py | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 0513348a18..526668bc23 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -262,23 +262,7 @@ class Git(FetchMethod): if ud.bareclone: cloneflags += " --mirror" - # 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) - bb.utils.mkdirhier(os.path.dirname(indirectiondir)) - os.symlink(ud.clonedir, indirectiondir) - clonedir = indirectiondir - - runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, clonedir, destdir), d) + runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, ud.clonedir, destdir), d) os.chdir(destdir) repourl = self._get_repo_url(ud) runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d) |