diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-12 15:42:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-12 15:42:52 -0400 |
| commit | cea65b9e5bf6bcc9a9350703dbbb0951c6e00c82 (patch) | |
| tree | 3187bf5c426f32b6d688182e81c6c06456994087 | |
| parent | e9bfa8eaed3ff59a4c0bc8d4d677bc493177807c (diff) | |
init: When run in an already initalized repository, and without a description specified, don't delete the old description.
| -rw-r--r-- | Command/Init.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Command/Init.hs b/Command/Init.hs index a6d72e422..bbabdc4c2 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -27,5 +27,5 @@ start ws = do perform :: String -> CommandPerform perform description = do - initialize (Just description) + initialize $ if null description then Nothing else Just description next $ return True diff --git a/debian/changelog b/debian/changelog index 76a29131d..a8ce33435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git-annex (3.20111112) UNRELEASED; urgency=low * Avoid doing auto-merging in commands that don't need fully current information from the git-annex branch. In particular, git annex add no longer needs to auto-merge. + * init: When run in an already initalized repository, and without + a description specified, don't delete the old description. -- Joey Hess <joeyh@debian.org> Sat, 12 Nov 2011 14:50:21 -0400 |