diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-07 15:22:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-07 15:35:36 -0400 |
| commit | ee0c34c8f2f94775b39ef10ed580cab47d2f929c (patch) | |
| tree | 8b1b26a7f379d85f4658003a5e8a72559d009fcc /CmdLine | |
| parent | 42a370de0544e65fc1f150d3b2406b6683b7e5e1 (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 'CmdLine')
| -rw-r--r-- | CmdLine/Seek.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index 8d253e47d..0b6cc1e78 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -80,7 +80,7 @@ withFilesInRefs a = mapM_ go l <- inRepo $ LsTree.lsTree (Git.Ref r) forM_ l $ \i -> do let f = getTopFilePath $ LsTree.file i - v <- catKey (Git.Ref $ LsTree.sha i) (LsTree.mode i) + v <- catKey (Git.Ref $ LsTree.sha i) case v of Nothing -> noop Just k -> whenM (matcher $ MatchingKey k) $ |