mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix abs filepath generation

Browse source
This commit is contained in:
Joey Hess 2016-03-03 16:47:51 -04:00
parent 40509e20e5
commit ac08f6580e
Failed to extract signature
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Annex/AdjustedBranch.hs
View file

@ -60,7 +60,7 @@ adjustTreeItem UnlockAdjustment Reverse h ti@(TreeItem f m s)
case mk of case mk of
Just k -> do Just k -> do
absf <- inRepo $ \r -> absPath $ absf <- inRepo $ \r -> absPath $
repoPath r <> fromTopFilePath f r fromTopFilePath f r
linktarget <- calcRepo $ gitAnnexLink absf k linktarget <- calcRepo $ gitAnnexLink absf k
Just . TreeItem f (fromBlobType SymlinkBlob) Just . TreeItem f (fromBlobType SymlinkBlob)
<$> hashSymlink' h linktarget <$> hashSymlink' h linktarget
@ -221,7 +221,8 @@ propigateAdjustedCommits :: OrigBranch -> (Adjustment, AdjBranch) -> Annex ()
propigateAdjustedCommits origbranch (adj, currbranch) = do propigateAdjustedCommits origbranch (adj, currbranch) = do
v <- inRepo $ Git.Ref.sha (Git.Ref.under "refs/heads" origbranch) v <- inRepo $ Git.Ref.sha (Git.Ref.under "refs/heads" origbranch)
case v of case v of
Just origsha -> go origsha False =<< newcommits Just origsha -> preventCommits $
go origsha False =<< newcommits
Nothing -> return () Nothing -> return ()
where where
newcommits = inRepo $ Git.Branch.changedCommits origbranch currbranch newcommits = inRepo $ Git.Branch.changedCommits origbranch currbranch