diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-07 12:47:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-07 12:47:41 -0400 |
| commit | 41eecb4601896f7ece2151ff79775dd591e91b37 (patch) | |
| tree | 871b08db9a1f9e4bcf657f00f3030d2f944dae3d | |
| parent | aae0417d94c4ae81d28f2301bc1fac61d4f499a4 (diff) | |
Bugfix: In the past two releases, git-annex init has written the uuid.log in the wrong format, with the UUID and description flipped.
This is my own damn fault for not making UUID a real type, and then relying
on the type checker to ensure my refactoring was correct -- which it wasn't!
I should probably add code to clean up bogus entries in the uuid.log, but
right now I want to get the fix out there to prevent people experiencing
this bug.
I should also make UUID a real data type.
| -rw-r--r-- | Command/Init.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Command/Init.hs b/Command/Init.hs index 69cdc8e8a..e2a6eb7b0 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -30,5 +30,6 @@ start ws = do perform :: String -> CommandPerform perform description = do initialize - getUUID >>= describeUUID description + u <- getUUID + describeUUID u description next $ return True diff --git a/debian/changelog b/debian/changelog index c09ca6578..57be7dd67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git-annex (3.20111106) UNRELEASED; urgency=low Thanks Valentin Haenel for a test case showing how non-fast-forward merges could result in an ongoing pull/merge/push cycle. * Don't try to read config from repos with annex-ignore set. + * Bugfix: In the past two releases, git-annex init has written the uuid.log + in the wrong format, with the UUID and description flipped. -- Joey Hess <joeyh@debian.org> Sun, 06 Nov 2011 14:57:57 -0400 |