diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-03 16:47:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-03 16:47:51 -0400 |
| commit | 73403cff30a5b6d9d4578a2709cf61b9c8cb945a (patch) | |
| tree | e2195913468f573e5d14ae899dd767c6f7b7494d /Annex/AdjustedBranch.hs | |
| parent | 9b8225baa1c5fde927b0c6239a7bd479a7b30a6e (diff) | |
fix abs filepath generation
Diffstat (limited to 'Annex/AdjustedBranch.hs')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 6ba229b9c..3c53ea924 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -60,7 +60,7 @@ adjustTreeItem UnlockAdjustment Reverse h ti@(TreeItem f m s) case mk of Just k -> do absf <- inRepo $ \r -> absPath $ - repoPath r <> fromTopFilePath f r + fromTopFilePath f r linktarget <- calcRepo $ gitAnnexLink absf k Just . TreeItem f (fromBlobType SymlinkBlob) <$> hashSymlink' h linktarget @@ -221,7 +221,8 @@ propigateAdjustedCommits :: OrigBranch -> (Adjustment, AdjBranch) -> Annex () propigateAdjustedCommits origbranch (adj, currbranch) = do v <- inRepo $ Git.Ref.sha (Git.Ref.under "refs/heads" origbranch) case v of - Just origsha -> go origsha False =<< newcommits + Just origsha -> preventCommits $ + go origsha False =<< newcommits Nothing -> return () where newcommits = inRepo $ Git.Branch.changedCommits origbranch currbranch |