diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-06 13:46:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-06 13:46:11 -0400 |
| commit | 3fb763b096fb5c4a2c9119f88ea46ed81bdda07e (patch) | |
| tree | aaa0f0647722d244d2186b129dfb3eea94117943 /Annex/Fixup.hs | |
| parent | 0e2090b7358e3218fcba837e8298617b5d7fea6d (diff) | |
avoid using --literal-pathspecs with git older than 1.8.1 which added it
Windows is still building with an older git.
Diffstat (limited to 'Annex/Fixup.hs')
| -rw-r--r-- | Annex/Fixup.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 99b4ea2d5..4d9afea91 100644 --- a/Annex/Fixup.hs +++ b/Annex/Fixup.hs @@ -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 |