diff options
author | Joey Hess <joey@kitenet.net> | 2011-06-22 16:02:43 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-06-22 16:03:09 -0400 |
commit | 5c706d1ec48172f98e1826684ab380a69079b66a (patch) | |
tree | 4c73aa9383105a1d640271f5b57a771fbd1657da /Command/Uninit.hs | |
parent | 80274f4c92397a88c62bf82459fe0c1a9bf03bf7 (diff) |
stop undoing gitattributes on uninit
v2 upgrade will undo them
Diffstat (limited to 'Command/Uninit.hs')
-rw-r--r-- | Command/Uninit.hs | 11 |
1 files changed, 0 insertions, 11 deletions
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 |