summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn2
-rw-r--r--doc/news/version_4.20131101.mdwn29
-rw-r--r--doc/news/version_5.20131130.mdwn4
-rw-r--r--git-annex.cabal2
5 files changed, 9 insertions, 32 deletions
diff --git a/debian/changelog b/debian/changelog
index 02c5318ff..be97830a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-git-annex (5.20131127.2) UNRELEASED; urgency=low
+git-annex (5.20131130) unstable; urgency=low
* init: Fix a bug that caused git annex init, when run in a bare
repository, to set core.bare=false.
- -- Joey Hess <joeyh@debian.org> Sat, 30 Nov 2013 16:10:48 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 30 Nov 2013 16:32:35 -0400
git-annex (5.20131127.1) unstable; urgency=low
diff --git a/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn b/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn
index 96158dcde..a35bc9c3d 100644
--- a/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn
+++ b/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn
@@ -86,3 +86,5 @@ Everything up-to-date
# End of transcript or log.
"""]]
+
+> [[fixed|done]] --[[Joey]]
diff --git a/doc/news/version_4.20131101.mdwn b/doc/news/version_4.20131101.mdwn
deleted file mode 100644
index 2c6bb309d..000000000
--- a/doc/news/version_4.20131101.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-git-annex 4.20131101 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * The "git annex content" command is renamed to "git annex wanted".
- * New --want-get and --want-drop options which can be used to
- test preferred content settings.
- For example, "git annex find --in . --want-drop"
- * assistant: When autostarted, wait 5 seconds before running the startup
- scan, to avoid contending with the user's desktop login process.
- * webapp: When setting up a bare shared repository, enable non-fast-forward
- pushes.
- * sync: Show a hint about receive.denyNonFastForwards when a push fails.
- * directory, webdav: Fix bug introduced in version 4.20131002 that
- caused the chunkcount file to not be written. Work around repositories
- without such a file, so files can still be retreived from them.
- * assistant: Automatically repair damanged git repository, if it can
- be done without losing data.
- * assistant: Support repairing git remotes that are locally accessible
- (eg, on removable drives).
- * add: Fix reversion in 4.20130827 when adding unlocked files that have
- not yet been committed.
- * unannex: New, much slower, but more safe behavior: Copies files out of
- the annex. This avoids an unannex of one file breaking other files that
- link to the same content. Also, it means that the content
- remains in the annex using up space until cleaned up with
- "git annex unused".
- (The behavior of unannex --fast has not changed; it still hard links
- to content in the annex. --fast was not made the default because it is
- potentially unsafe; editing such a hard linked file can unexpectedly
- change content stored in the annex.)"""]] \ No newline at end of file
diff --git a/doc/news/version_5.20131130.mdwn b/doc/news/version_5.20131130.mdwn
new file mode 100644
index 000000000..f1430e3b5
--- /dev/null
+++ b/doc/news/version_5.20131130.mdwn
@@ -0,0 +1,4 @@
+git-annex 5.20131130 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * init: Fix a bug that caused git annex init, when run in a bare
+ repository, to set core.bare=false."""]] \ No newline at end of file
diff --git a/git-annex.cabal b/git-annex.cabal
index eb451a76a..fa9ea062c 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20131127.1
+Version: 5.20131130
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>