From 5c706d1ec48172f98e1826684ab380a69079b66a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Jun 2011 16:02:43 -0400 Subject: stop undoing gitattributes on uninit v2 upgrade will undo them --- Command/Uninit.hs | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'Command') diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 1e96e1e6f..9698ed820 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -34,10 +34,7 @@ start = do perform :: CommandPerform perform = do g <- Annex.gitRepo - gitPreCommitHookUnWrite g - liftIO $ gitAttributesUnWrite g - next $ return True gitPreCommitHookUnWrite :: Git.Repo -> Annex () @@ -50,11 +47,3 @@ gitPreCommitHookUnWrite repo = do else warning $ "pre-commit hook (" ++ hook ++ ") contents modified; not deleting." ++ " Edit it to remove call to git annex." - -gitAttributesUnWrite :: Git.Repo -> IO () -gitAttributesUnWrite repo = do - let attributes = Git.attributes repo - whenM (doesFileExist attributes) $ do - c <- readFileStrict attributes - safeWriteFile attributes $ unlines $ - filter (\l -> not $ l `elem` Command.Init.attrLines) $ lines c -- cgit v1.2.3