diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-26 18:10:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-26 18:10:07 -0400 |
| commit | 20b25dd58fa97d0433ed50fb5d1e9a7b8202a70a (patch) | |
| tree | 8cc23d2fe44f933fb7ec22c925baa5a4a32055f5 /Command | |
| parent | 083dd734e07400a9653977ffe2afb95dc52e4646 (diff) | |
correct recent fix
588a981e17461643b67f9a372703b9e0896b6e17's fix caused it to try to stage a
symlink in .git/annex/tmp, oops
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Sync.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 9923d6dfd..96aae888b 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -271,7 +271,8 @@ resolveMerge' u makelink (Just key) = do let dest = mergeFile file key l <- inRepo $ gitAnnexLink dest key - replaceFile dest $ addAnnexLink l + replaceFile dest $ makeAnnexLink l + stageSymlink dest =<< hashSymlink l whenM (isDirect) $ toDirect key dest makelink _ = noop |