aboutsummaryrefslogtreecommitdiff
path: root/Command/Indirect.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-07 15:22:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-07 15:35:36 -0400
commitee0c34c8f2f94775b39ef10ed580cab47d2f929c (patch)
tree8b1b26a7f379d85f4658003a5e8a72559d009fcc /Command/Indirect.hs
parent42a370de0544e65fc1f150d3b2406b6683b7e5e1 (diff)
support pointer files
Backend.lookupFile is changed to always fall back to catKey when operating on a file that's not a symlink. catKey is changed to understand pointer files, as well as annex symlinks. Before, catKey needed a file mode witness, to be sure it was looking at a symlink. That was complicated stuff. Now, it doesn't actually care if a file in git is a symlink or not; in either case asking git for the content of the file will get the pointer to the key. This does mean that git-annex will treat a link foo -> WORM--bar as a git-annex file, and also treats a regular file containing annex/objects/WORM--bar as a git-annex file. Calling catKey could make git-annex commands need to do more work than before. This would especially be the case if a repo contained many regular files, and only a few annexed files, as now git-annex will need to ask git about the contents of the regular files.
Diffstat (limited to 'Command/Indirect.hs')
-rw-r--r--Command/Indirect.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index c12c91a48..f5234b4dc 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -76,7 +76,7 @@ perform = do
return Nothing
| otherwise ->
maybe noop (fromdirect f)
- =<< catKey sha mode
+ =<< catKey sha
_ -> noop
go _ = noop