diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 21:10:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 21:10:01 -0400 |
| commit | b68a9a8a4d4380afb7e89041741d957bcec3b0c3 (patch) | |
| tree | 19c18250efe6abc67cbdc284a830eeb34ae236d1 /Annex | |
| parent | 6be8289158fd30d972ac22766452e7c9dc809e6f (diff) | |
| parent | 59803f1595f16a53d789b98b8239b8e9afe7957f (diff) | |
Merge branch 'master' into relativepaths
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/View.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Annex/View.hs b/Annex/View.hs index 4cbf274aa..e148203c2 100644 --- a/Annex/View.hs +++ b/Annex/View.hs @@ -340,8 +340,9 @@ applyView' mkviewedfile getfilemetadata view = do genViewBranch view $ do uh <- inRepo Git.UpdateIndex.startUpdateIndex hasher <- inRepo hashObjectStart - forM_ l $ \f -> - go uh hasher f =<< Backend.lookupFile f + forM_ l $ \f -> do + relf <- getTopFilePath <$> inRepo (toTopFilePath f) + go uh hasher relf =<< Backend.lookupFile f liftIO $ do hashObjectStop hasher void $ stopUpdateIndex uh @@ -352,7 +353,8 @@ applyView' mkviewedfile getfilemetadata view = do metadata <- getCurrentMetaData k let metadata' = getfilemetadata f `unionMetaData` metadata forM_ (genviewedfiles f metadata') $ \fv -> do - stagesymlink uh hasher fv =<< inRepo (gitAnnexLink fv k) + f' <- fromRepo $ fromTopFilePath $ asTopFilePath fv + stagesymlink uh hasher f' =<< inRepo (gitAnnexLink f' k) go uh hasher f Nothing | "." `isPrefixOf` f = do s <- liftIO $ getSymbolicLinkStatus f |