From 43d17632f6c7e395618a3289654808dae80aa737 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 6 Feb 2014 17:35:37 -0400 Subject: [PATCH] remove workaround for old bug ef24751922118451964529dbc6108974ee235800 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. --- Annex/Content.hs | 6 +----- .../Mac_OS_git_version_too_old_to_honour_.gitignore.mdwn | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Annex/Content.hs b/Annex/Content.hs index 6e494ecf46..6aef77830e 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 diff --git a/doc/bugs/Mac_OS_git_version_too_old_to_honour_.gitignore.mdwn b/doc/bugs/Mac_OS_git_version_too_old_to_honour_.gitignore.mdwn index f5aa3b078b..0cf61bb0fc 100644 --- a/doc/bugs/Mac_OS_git_version_too_old_to_honour_.gitignore.mdwn +++ b/doc/bugs/Mac_OS_git_version_too_old_to_honour_.gitignore.mdwn @@ -34,3 +34,5 @@ git version 1.8.3.4 (Apple Git-47) # /usr/local/bin/git --version git version 1.8.5.3 """]] + +> [[fixed|done]]; it has been updated to 1.8.5.3 on the autobuilder. --[[Joey]]