assistant: When built with git before 1.8.0, use `git remote rm` to delete a remote. Newer git uses `git remote remove`.

1 files changed, 6 insertions, 1 deletions

diff --git a/Assistant/DeleteRemote.hs b/Assistant/DeleteRemote.hs
index 25049103e..de3d4124b 100644
--- a/Assistant/DeleteRemote.hs
+++ b/Assistant/DeleteRemote.hs
@@ -18,6 +18,7 @@ import Assistant.DaemonStatus
 import qualified Remote
 import Remote.List
 import qualified Git.Command
+import qualified Git.Version
 import Logs.Trust
 import qualified Annex
 
@@ -36,7 +37,11 @@ disableRemote uuid = do
 	liftAnnex $ do
 		inRepo $ Git.Command.run
 			[ Param "remote"
-			, Param "remove"
+			-- name of this subcommand changed
+			, Param $
+				if Git.Version.older "1.8.0"
+					then "rm"
+					else "remove"
 			, Param (Remote.name remote)
 			]
 		void $ remoteListRefresh