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

correct recent fix

Browse source 
fc37456d0fe1fb0fd3e33338223977b3e7a940bb's fix caused it to try to stage a
symlink in .git/annex/tmp, oops
This commit is contained in:
Joey Hess 2013-05-26 18:10:07 -04:00
parent 919a7d7316
commit 2180068e30
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Sync.hs
View file

@ -271,7 +271,8 @@ resolveMerge' u
makelink (Just key) = do makelink (Just key) = do
let dest = mergeFile file key let dest = mergeFile file key
l <- inRepo $ gitAnnexLink dest key l <- inRepo $ gitAnnexLink dest key
replaceFile dest $ addAnnexLink l replaceFile dest $ makeAnnexLink l
stageSymlink dest =<< hashSymlink l
whenM (isDirect) $ whenM (isDirect) $
toDirect key dest toDirect key dest
makelink _ = noop makelink _ = noop