diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-08-17 14:14:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-08-17 14:44:31 -0400 |
| commit | 56f6923ccbc6fb1932137b53458a4cece47e69b0 (patch) | |
| tree | a2c9a949f2c6c5163551a76f4012e7606e3c1463 /Command/Uninit.hs | |
| parent | 3b5f7221305ba6e768711d8326a01b78fb1e4f79 (diff) | |
Now "git annex init" only has to be run once
when a git repository is first being created. Clones will automatically
notice that git-annex is in use and automatically perform a basic
initalization. It's still recommended to run "git annex init" in any
clones, to describe them.
Diffstat (limited to 'Command/Uninit.hs')
| -rw-r--r-- | Command/Uninit.hs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 8b8d7e364..195246aa8 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -12,13 +12,11 @@ import System.Directory import System.Exit import Command -import Messages -import Types import Utility import qualified Git import qualified Annex import qualified Command.Unannex -import qualified Command.Init +import Init import qualified Branch import Content import Locations @@ -47,7 +45,7 @@ perform = next cleanup cleanup :: CommandCleanup cleanup = do g <- Annex.gitRepo - gitPreCommitHookUnWrite g + uninitialize mapM_ removeAnnex =<< getKeysPresent liftIO $ removeDirectoryRecursive (gitAnnexDir g) -- avoid normal shutdown @@ -55,14 +53,3 @@ cleanup = do liftIO $ do Git.run g "branch" [Param "-D", Param Branch.name] exitSuccess - -gitPreCommitHookUnWrite :: Git.Repo -> Annex () -gitPreCommitHookUnWrite repo = do - let hook = Command.Init.preCommitHook repo - whenM (liftIO $ doesFileExist hook) $ do - c <- liftIO $ readFile hook - if c == Command.Init.preCommitScript - then liftIO $ removeFile hook - else warning $ "pre-commit hook (" ++ hook ++ - ") contents modified; not deleting." ++ - " Edit it to remove call to git annex." |