summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-18 13:25:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-18 13:25:06 -0400
commit881cc417e307a797de13edacb3e82485b239f3fd (patch)
tree8b43c2e1c2739b46fcbb4e41fb1458566716cd3a
parent112041fa3c9a6a36b485806c60cf87ccf8a373ad (diff)
list: Fix specifying of files to list.
-rw-r--r--Command/List.hs6
-rw-r--r--debian/changelog1
2 files changed, 4 insertions, 3 deletions
diff --git a/Command/List.hs b/Command/List.hs
index 12c27c022..663da4500 100644
--- a/Command/List.hs
+++ b/Command/List.hs
@@ -33,7 +33,7 @@ allrepos = Option.flag [] "allrepos" "show all repositories, not only remotes"
seek :: [CommandSeek]
seek =
- [ withValue getList $ withNothing . startHeader
+ [ withValue getList $ withWords . startHeader
, withValue getList $ withFilesInGit . whenAnnexed . start
]
@@ -58,8 +58,8 @@ getList = ifM (Annex.getFlag $ Option.name allrepos)
return $ sortBy (comparing snd3) $
filter (\t -> thd3 t /= DeadTrusted) rs3
-startHeader :: [(UUID, RemoteName, TrustLevel)] -> CommandStart
-startHeader l = do
+startHeader :: [(UUID, RemoteName, TrustLevel)] -> [String] -> CommandStart
+startHeader l _ = do
liftIO $ putStrLn $ header $ map (\(_, n, t) -> (n, t)) l
stop
diff --git a/debian/changelog b/debian/changelog
index 0d6020094..0b5845835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ git-annex (5.20140118) UNRELEASED; urgency=medium
* Remove --json option from commands not supporting it.
* status: Support --json.
+ * list: Fix specifying of files to list.
-- Joey Hess <joeyh@debian.org> Sat, 18 Jan 2014 11:54:17 -0400