diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-11-28 14:40:26 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-11-28 15:14:16 -0400 |
commit | 699611cde5cda8b2f2d83a6d6ac9c1e575b74f51 (patch) | |
tree | b502247490779aca8068684a3be42791050eff7b /Command/EnableRemote.hs | |
parent | bf5de3a6f3d50028f7ac47c6cde759a6f5110b08 (diff) |
showStart variant for when there's no worktree file
Clean up some uses of showStart with "" for the file,
or in some cases, a non-filename description string. That would
generate bad json, although none of the commands doing that
supported --json.
Using "" for the file resulted in output like "foo rest";
now the extra space is eliminated.
This commit was sponsored by Fernando Jimenez on Patreon.
Diffstat (limited to 'Command/EnableRemote.hs')
-rw-r--r-- | Command/EnableRemote.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs index fd830375a..d9993ebc9 100644 --- a/Command/EnableRemote.hs +++ b/Command/EnableRemote.hs @@ -55,7 +55,7 @@ start (name:rest) = go =<< filter matchingname <$> Annex.fromRepo Git.remotes startNormalRemote :: Git.RemoteName -> [String] -> Git.Repo -> CommandStart startNormalRemote name restparams r | null restparams = do - showStart "enableremote" name + showStart' "enableremote" (Just name) next $ next $ do setRemoteIgnore r False r' <- Remote.Git.configRead False r @@ -77,7 +77,7 @@ startSpecialRemote name config Nothing = do startSpecialRemote name config (Just (u, c)) = do let fullconfig = config `M.union` c t <- either giveup return (Annex.SpecialRemote.findType fullconfig) - showStart "enableremote" name + showStart' "enableremote" (Just name) gc <- maybe (liftIO dummyRemoteGitConfig) (return . Remote.gitconfig) =<< Remote.byUUID u |