remove workaround for old bug

ef24751922 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

@@ -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

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]]