avoid using --literal-pathspecs with git older than 1.8.1 which added it
Windows is still building with an older git.
This commit is contained in:
parent
aba1464fe4
commit
42e46a8701
3 changed files with 8 additions and 5 deletions
|
@ -11,6 +11,7 @@ import Git.Types
|
||||||
import Git.Config
|
import Git.Config
|
||||||
import Types.GitConfig
|
import Types.GitConfig
|
||||||
import qualified Git.Construct as Construct
|
import qualified Git.Construct as Construct
|
||||||
|
import qualified Git.BuildVersion
|
||||||
import Utility.Path
|
import Utility.Path
|
||||||
import Utility.SafeCommand
|
import Utility.SafeCommand
|
||||||
import Utility.Directory
|
import Utility.Directory
|
||||||
|
@ -36,8 +37,10 @@ fixupRepo r c = do
|
||||||
{- Disable git's built-in wildcard expansion, which is not wanted
|
{- Disable git's built-in wildcard expansion, which is not wanted
|
||||||
- when using it as plumbing by git-annex. -}
|
- when using it as plumbing by git-annex. -}
|
||||||
disableWildcardExpansion :: Repo -> Repo
|
disableWildcardExpansion :: Repo -> Repo
|
||||||
disableWildcardExpansion r = r
|
disableWildcardExpansion r
|
||||||
{ gitGlobalOpts = gitGlobalOpts r ++ [Param "--literal-pathspecs"] }
|
| Git.BuildVersion.older "1.8.1" = r
|
||||||
|
| otherwise = r
|
||||||
|
{ gitGlobalOpts = gitGlobalOpts r ++ [Param "--literal-pathspecs"] }
|
||||||
|
|
||||||
{- Direct mode repos have core.bare=true, but are not really bare.
|
{- Direct mode repos have core.bare=true, but are not really bare.
|
||||||
- Fix up the Repo to be a non-bare repo, and arrange for git commands
|
- Fix up the Repo to be a non-bare repo, and arrange for git commands
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -10,7 +10,7 @@ git-annex (5.20150406) unstable; urgency=medium
|
||||||
guid has been downloaded before, even when the url has changed.
|
guid has been downloaded before, even when the url has changed.
|
||||||
* importfeed: Always store itemid in metadata; before this was only
|
* importfeed: Always store itemid in metadata; before this was only
|
||||||
done when annex.genmetadata was set.
|
done when annex.genmetadata was set.
|
||||||
* Relax debian package dependencies to git >= 1:1.7.7.6 rather
|
* Relax debian package dependencies to git >= 1:1.8.1 rather
|
||||||
than needing >= 1:2.0.
|
than needing >= 1:2.0.
|
||||||
* test: Fix --list-tests
|
* test: Fix --list-tests
|
||||||
* addurl --file: When used with a special remote that claims
|
* addurl --file: When used with a special remote that claims
|
||||||
|
|
4
debian/control
vendored
4
debian/control
vendored
|
@ -75,7 +75,7 @@ Build-Depends:
|
||||||
lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any],
|
lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any],
|
||||||
ikiwiki,
|
ikiwiki,
|
||||||
perlmagick,
|
perlmagick,
|
||||||
git (>= 1:1.7.7.6),
|
git (>= 1:1.8.1),
|
||||||
rsync,
|
rsync,
|
||||||
wget,
|
wget,
|
||||||
curl,
|
curl,
|
||||||
|
@ -92,7 +92,7 @@ Package: git-annex
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Section: utils
|
Section: utils
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends},
|
Depends: ${misc:Depends}, ${shlibs:Depends},
|
||||||
git (>= 1:1.7.7.6),
|
git (>= 1:1.8.1),
|
||||||
rsync,
|
rsync,
|
||||||
wget,
|
wget,
|
||||||
curl,
|
curl,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue