don't try to set up .gitattributes every time; only do it on git annex init
This commit is contained in:
parent
4e7c27f58b
commit
3281a1cb19
3 changed files with 8 additions and 3 deletions
|
@ -346,7 +346,7 @@ fixCleanup file = do
|
|||
Annex.queue "add" [] file
|
||||
return True
|
||||
|
||||
{- Stores description for the repository. -}
|
||||
{- Stores description for the repository etc. -}
|
||||
initStart :: String -> Annex (Maybe SubCmdPerform)
|
||||
initStart description = do
|
||||
if (null description)
|
||||
|
@ -359,6 +359,7 @@ initPerform description = do
|
|||
g <- Annex.gitRepo
|
||||
u <- getUUID g
|
||||
describeUUID u description
|
||||
liftIO $ gitAttributes g
|
||||
return $ Just $ initCleanup
|
||||
initCleanup :: Annex Bool
|
||||
initCleanup = do
|
||||
|
|
1
Core.hs
1
Core.hs
|
@ -22,7 +22,6 @@ import Utility
|
|||
startup :: Annex Bool
|
||||
startup = do
|
||||
g <- Annex.gitRepo
|
||||
liftIO $ gitAttributes g
|
||||
prepUUID
|
||||
return True
|
||||
|
||||
|
|
|
@ -91,7 +91,8 @@ Many git-annex subcommands will stage changes for later `git commit` by you.
|
|||
|
||||
* init description
|
||||
|
||||
Initializes git-annex with a description of the git repository.
|
||||
Initializes git-annex with a description of the git repository,
|
||||
and sets up `.gitattributes` and the pre-commit hook.
|
||||
This is an optional, but recommended step.
|
||||
|
||||
* unannex [path ...]
|
||||
|
@ -106,6 +107,10 @@ Many git-annex subcommands will stage changes for later `git commit` by you.
|
|||
Fixes up symlinks that have become broken to again point to annexed content.
|
||||
This is useful to run if you have been moving the symlinks around.
|
||||
|
||||
You do not normally need to run this by hand since `git-annex init`
|
||||
installs a pre-commit hook that automatically fixes up symlinks when
|
||||
they are committed.
|
||||
|
||||
* fromkey file
|
||||
|
||||
This can be used to maually set up a file to link to a specified key
|
||||
|
|
Loading…
Reference in a new issue