diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-02 18:31:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-02 18:32:26 -0400 |
| commit | addc505584876cca50ccdcd1c982e9a5e10ec9b1 (patch) | |
| tree | 9da1fe90f8d96a038f939a9fc05d64c7af7e3369 /Assistant | |
| parent | 5921e627d75758101ccb38f76c83c3917ae897b7 (diff) | |
better git version checking
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/DeleteRemote.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/Committer.hs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Assistant/DeleteRemote.hs b/Assistant/DeleteRemote.hs index de3d4124b..2e06d52cd 100644 --- a/Assistant/DeleteRemote.hs +++ b/Assistant/DeleteRemote.hs @@ -18,7 +18,7 @@ import Assistant.DaemonStatus import qualified Remote import Remote.List import qualified Git.Command -import qualified Git.Version +import qualified Git.BuildVersion import Logs.Trust import qualified Annex @@ -39,7 +39,7 @@ disableRemote uuid = do [ Param "remote" -- name of this subcommand changed , Param $ - if Git.Version.older "1.8.0" + if Git.BuildVersion.older "1.8.0" then "rm" else "remove" , Param (Remote.name remote) diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index e069bda21..be3bc3c84 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -22,7 +22,7 @@ import Logs.Location import qualified Annex.Queue import qualified Git.Command import qualified Git.LsFiles -import qualified Git.Version +import qualified Git.BuildVersion import qualified Command.Add import Utility.ThreadScheduler import qualified Utility.Lsof as Lsof @@ -234,9 +234,9 @@ commitStaged = do , Param "--no-verify" ] nomessage ps - | Git.Version.older "1.7.2" = + | Git.BuildVersion.older "1.7.2" = Param "-m" : Param "autocommit" : ps - | Git.Version.older "1.7.8" = + | Git.BuildVersion.older "1.7.8" = Param "--allow-empty-message" : Param "-m" : Param "" : ps | otherwise = |