diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-08-29 14:13:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-08-29 14:13:38 -0400 |
| commit | d1154d0837f4dac18771a6a5c3ab96de4d5fcd90 (patch) | |
| tree | edd38f64b924189af8e55bbd2a2afd001b06a876 | |
| parent | b2c5639dcc53f6e734643878f9696405fa6cae64 (diff) | |
init: Make description an optional parameter.
| -rw-r--r-- | Command/Init.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Command/Init.hs b/Command/Init.hs index 019106051..2abe4c661 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -7,7 +7,7 @@ module Command.Init where -import Control.Monad (when) +import Control.Monad import Command import qualified Annex @@ -17,15 +17,13 @@ import Init command :: [Command] command = [standaloneCommand "init" paramDesc seek - "initialize git-annex with repository description"] + "initialize git-annex"] seek :: [CommandSeek] seek = [withWords start] start :: CommandStartWords start ws = do - when (null description) $ - error "please specify a description of this repository\n" showStart "init" description next $ perform description where diff --git a/debian/changelog b/debian/changelog index 54fdbd835..7803c9a62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ git-annex (3.20110820) UNRELEASED; urgency=low * Set EMAIL when running test suite so that git does not need to be configured first. Closes: #638998 * The wget command will now be used in preference to curl, if available. + * init: Make description an optional parameter. -- Joey Hess <joeyh@debian.org> Tue, 23 Aug 2011 13:41:01 -0400 diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 52599611e..e7ac9adf7 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -119,9 +119,7 @@ Many git-annex commands will stage changes for later `git commit` by you. Use this to undo an unlock command if you don't want to modify the files, or have made modifications you want to discard. -* init description - - Initializes git-annex with a description of the git repository. +* init [description] Until a repository (or one of its remotes) has been initialized, git-annex will refuse to operate on it, to avoid accidentially |