revert reversion

This reverts commit 7bfc4a5442.

Android build is going to have consistent versions again.

Command/Map.hs

@@ -194,11 +194,11 @@ tryScan r
 	| Git.repoIsUrl r = return Nothing
 	| otherwise = liftIO $ safely $ Git.Config.read r
   where
-	pipedconfig c params = liftIO $ safely $
+	pipedconfig cmd params = liftIO $ safely $
 		withHandle StdoutHandle createProcessSuccess p $
 			Git.Config.hRead r
 	  where
-		p = proc c $ toCommand params
+		p = proc cmd $ toCommand params
 
 	configlist = Ssh.onRemote r (pipedconfig, return Nothing) "configlist" [] []
 	manualconfiglist = do

Command/Trust.hs

@@ -24,11 +24,11 @@ seek :: CommandSeek
 seek = trustCommand "trust" Trusted
 
 trustCommand :: String -> TrustLevel -> CommandSeek
-trustCommand cmdname level = withWords start
+trustCommand cmd level = withWords start
   where
 	start ws = do
 		let name = unwords ws
-		showStart cmdname name
+		showStart cmd name
 		u <- Remote.nameToUUID name
 		next $ perform u
 	perform uuid = do