summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/Init.hs3
-rw-r--r--debian/changelog2
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