diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-09-09 14:15:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-09 14:15:56 -0400 |
| commit | 6238dddc0d340fb57e03beee81ccd9e954909bad (patch) | |
| tree | 73b1054969031528a772d54d8263cf159a948ee6 | |
| parent | e112ec127186bbc6d1528ad09d723988e068e834 (diff) | |
info: Support querying info of individual files in direct mode.
| -rw-r--r-- | Command/Info.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/git_annex_info_is_reporting_file_as_not_annexed_in_direct_mode.mdwn | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Command/Info.hs b/Command/Info.hs index a744f7402..9bf2101a0 100644 --- a/Command/Info.hs +++ b/Command/Info.hs @@ -24,7 +24,6 @@ import Command import Utility.DataUnits import Utility.DiskFree import Annex.Content -import Annex.Link import Types.Key import Logs.UUID import Logs.Trust @@ -127,8 +126,7 @@ itemInfo o p = ifM (isdir p) v' <- Remote.nameToUUID' p case v' of Right u -> uuidInfo o u - Left _ -> maybe noinfo (fileInfo o p) - =<< isAnnexLink p + Left _ -> ifAnnexed p (fileInfo o p) noinfo ) where isdir = liftIO . catchBoolIO . (isDirectory <$$> getFileStatus) diff --git a/debian/changelog b/debian/changelog index bfee64fbb..a06f6fcdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (5.20150825) UNRELEASED; urgency=medium * Fix Windows build to work with ghc 7.10. * init: Fix reversion in detection of repo made with git clone --shared + * info: Support querying info of individual files in direct mode. -- Joey Hess <id@joeyh.name> Tue, 01 Sep 2015 14:46:18 -0700 diff --git a/doc/bugs/git_annex_info_is_reporting_file_as_not_annexed_in_direct_mode.mdwn b/doc/bugs/git_annex_info_is_reporting_file_as_not_annexed_in_direct_mode.mdwn index 2fd39abf1..d60b760f9 100644 --- a/doc/bugs/git_annex_info_is_reporting_file_as_not_annexed_in_direct_mode.mdwn +++ b/doc/bugs/git_annex_info_is_reporting_file_as_not_annexed_in_direct_mode.mdwn @@ -35,6 +35,4 @@ git-annex: 1.dat is not a directory or an annexed file or a remote or a uuid """]] -### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) - - +> [[fixed|done]] --[[Joey]] |