From b2f46c703d172a395abac96508578186e36bb504 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 18 May 2015 11:25:26 -0700 Subject: Fix SPACK-87: Tag checkout fails for older git versions. --- lib/spack/spack/fetch_strategy.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 48313e2b37..c892e9ea26 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -363,10 +363,6 @@ class GitFetchStrategy(VCSFetchStrategy): 'git', 'tag', 'branch', 'commit', **kwargs) self._git = None - # For git fetch branches and tags the same way. - if not self.branch: - self.branch = self.tag - @property def git_version(self): @@ -422,6 +418,12 @@ class GitFetchStrategy(VCSFetchStrategy): self.git(*args) self.stage.chdir_to_source() + # For tags, be conservative and check them out AFTER + # cloning. Later git versions can do this with clone + # --branch, but older ones fail. + if self.tag: + self.git('checkout', self.tag) + def archive(self, destination): super(GitFetchStrategy, self).archive(destination, exclude='.git') -- cgit v1.2.3-60-g2f50