From 2180068e30880dae893b2494e10e9e19e1953e95 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 May 2013 18:10:07 -0400 Subject: [PATCH] correct recent fix fc37456d0fe1fb0fd3e33338223977b3e7a940bb's fix caused it to try to stage a symlink in .git/annex/tmp, oops --- Command/Sync.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index 9923d6dfd3..96aae888b5 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