diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-06 17:35:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-06 17:36:14 -0400 |
| commit | 085c06857947b84356fbe7b26e875e32aad80946 (patch) | |
| tree | cdef6700424893113e617469d59b556e00fbaee6 /Annex | |
| parent | 2d724015bdfdeb54d130d8e9a240f3fbe75306c7 (diff) | |
remove workaround for old bug
560b644a52971a7e4706c775982ec29e03ca3ab2 described a bug moving between
remotes in direct mode; I can no longer reproduce it with this strange
workaround removed. Also test suite still passes. Hope the broken code just
got fixed in the meantime.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Content.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 6e494ecf4..6aef77830 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -434,12 +434,8 @@ removeAnnex key = withObjectLoc key remove removedirect mapM_ (resetfile cache) fs resetfile cache f = whenM (sameInodeCache f cache) $ do l <- inRepo $ gitAnnexLink f key - top <- fromRepo Git.repoPath - cwd <- liftIO getCurrentDirectory - let top' = fromMaybe top $ absNormPathUnix cwd top - let l' = relPathDirToFile top' (fromMaybe l $ absNormPathUnix top' l) secureErase f - replaceFile f $ makeAnnexLink l' + replaceFile f $ makeAnnexLink l {- Runs the secure erase command if set, otherwise does nothing. - File may or may not be deleted at the end; caller is responsible for |