diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Direct.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index a3bc951d1..c958ac287 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -27,6 +27,7 @@ import Utility.InodeCache import Utility.CopyFile import Annex.Perms import Annex.ReplaceFile +import Annex.Exception {- Uses git ls-files to find files that need to be committed, and stages - them into the index. Returns True if some changes were staged. -} @@ -139,8 +140,10 @@ mergeDirectCleanup d oldsha newsha = do liftIO $ removeDirectoryRecursive d where updated item = do - go DiffTree.srcsha DiffTree.srcmode moveout moveout_raw - go DiffTree.dstsha DiffTree.dstmode movein movein_raw + void $ tryAnnex $ + go DiffTree.srcsha DiffTree.srcmode moveout moveout_raw + void $ tryAnnex $ + go DiffTree.dstsha DiffTree.dstmode movein movein_raw where go getsha getmode a araw | getsha item == nullSha = noop |