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 Types.GitConfig
|
||||
import qualified Git.Construct as Construct
|
||||
import qualified Git.BuildVersion
|
||||
import Utility.Path
|
||||
import Utility.SafeCommand
|
||||
import Utility.Directory
|
||||
|
@ -36,8 +37,10 @@ fixupRepo r c = do
|
|||
{- Disable git's built-in wildcard expansion, which is not wanted
|
||||
- when using it as plumbing by git-annex. -}
|
||||
disableWildcardExpansion :: Repo -> Repo
|
||||
disableWildcardExpansion r = r
|
||||
{ gitGlobalOpts = gitGlobalOpts r ++ [Param "--literal-pathspecs"] }
|
||||
disableWildcardExpansion r
|
||||
| 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.
|
||||
- Fix up the Repo to be a non-bare repo, and arrange for git commands
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue