diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-11 13:19:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-11 13:19:01 -0400 |
| commit | 7f03b97ea3631f266c188f49475685ab9d507783 (patch) | |
| tree | 5cce8142e2bac0d4c2769d235e16fe44e342c825 /CmdLine | |
| parent | f42f4fe966e317b984f51a32f5716f92e724ceef (diff) | |
metadata: Fix reversion introduced in 5.20150727 that caused display of metadata to not work.
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/Seek.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index e67c3b908..8d253e47d 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -33,11 +33,11 @@ withFilesInGit :: (FilePath -> CommandStart) -> CmdParams -> CommandSeek withFilesInGit a params = seekActions $ prepFiltered a $ seekHelper LsFiles.inRepo params -withFilesInGitNonRecursive :: (FilePath -> CommandStart) -> CmdParams -> CommandSeek -withFilesInGitNonRecursive a params = ifM (Annex.getState Annex.force) +withFilesInGitNonRecursive :: String -> (FilePath -> CommandStart) -> CmdParams -> CommandSeek +withFilesInGitNonRecursive needforce a params = ifM (Annex.getState Annex.force) ( withFilesInGit a params , if null params - then needforce + then error needforce else seekActions $ prepFiltered a (getfiles [] params) ) where @@ -51,8 +51,7 @@ withFilesInGitNonRecursive a params = ifM (Annex.getState Annex.force) [] -> do void $ liftIO $ cleanup getfiles c ps - _ -> needforce - needforce = error "Not recursively setting metadata. Use --force to do that." + _ -> error needforce withFilesNotInGit :: Bool -> (FilePath -> CommandStart) -> CmdParams -> CommandSeek withFilesNotInGit skipdotfiles a params |