From 1dad3af3fc1ef0e2e9c5880681aa0e3339d12796 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 11 Dec 2015 16:12:42 -0400 Subject: [PATCH] checked getKeysPresent; it's ok for v6 unlocked files When a v6 unlocked files is removed from the work tree, unused doesn't show it. When it gets removed from the index, unused does show it. This is the same as a locked file. --- Annex/Content.hs | 6 +++--- doc/todo/smudge.mdwn | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Annex/Content.hs b/Annex/Content.hs index f0c8e25cdc..f4daa3813a 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -744,9 +744,9 @@ data KeyLocation = InAnnex | InRepository {- List of keys whose content exists in the specified location. - - InAnnex only lists keys under .git/annex/objects, - - while InRepository, in direct mode, also finds keys located in the - - work tree. + - InAnnex only lists keys with content in .git/annex/objects, + - while InRepository, in direct mode, also finds keys with content + - in the work tree. - - Note that InRepository has to check whether direct mode files - have goodContent. diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 5cff8672cc..47613774ca 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -345,7 +345,6 @@ files to be unlocked, while the indirect upgrades don't touch the files. when pushing changes committed in such a repo. Ideally, should avoid committing implicit unlocks, or should prevent such commits leaking out in pushes. -* getKeysPresent needs to check if object file is modified ---- -- 2.30.2