diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-06-13 14:57:52 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-13 14:57:52 -0400 |
| commit | 704bcde3c8b07cafcc10f66572176dc8a9eacd90 (patch) | |
| tree | e7081a2fcd547f52a7c0790b1aaa8126c4a9ccb7 | |
| parent | 0fda7efadcdd49f2108fefc9f537afde8f2ae4c4 (diff) | |
prep release
| -rw-r--r-- | CHANGELOG | 16 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
2 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ -git-annex (6.20160528) UNRELEASED; urgency=medium +git-annex (6.20160613) unstable; urgency=medium * Improve SHA*E extension extraction code. * Windows: Avoid terminating git-annex branch lines with \r\n when @@ -11,20 +11,20 @@ git-annex (6.20160528) UNRELEASED; urgency=medium * Pass -S to git commit-tree when commit.gpgsign is set and when making a non-automatic commit, in order to preserve current behavior when used with git 2.9, which has stopped doing this itself. - * Automatically enable v6 mode when initializing in a clone from a repo - that has an adjusted branch checked out. - * Fix initialization of a bare clone of a repo that has an adjusted - branch checked out. * remotedaemon: Fixed support for notifications of changes to gcrypt remotes, which was never tested and didn't quite work before. * list: Do not include dead repositories. * move --to: Better behavior when system is completely out of disk space; drop content from disk before writing location log. + * Avoid a crash if getpwuid does not work, when querying the user's full + name. + * Automatically enable v6 mode when initializing in a clone from a repo + that has an adjusted branch checked out. + * v6: Fix initialization of a bare clone of a repo that has an adjusted + branch checked out. * v6: Fix bad automatic merge conflict resolution between an annexed file and a directory with the same name when in an adjusted branch. * v6: Fix bad merge in an adjusted branch that resulted in an empty tree. - * Avoid a crash if getpwuid does not work, when querying the user's full - name. * v6: Fix bug in initialization of clone from a repo with an adjusted branch that had not been synced back to master. (This bug caused broken tree objects to get built by a later git annex @@ -33,7 +33,7 @@ git-annex (6.20160528) UNRELEASED; urgency=medium * v6: Fix update of associated files db when unlocking a file. * v6: Make git clean filter preserve the backend that was used for a file. - -- Joey Hess <id@joeyh.name> Fri, 27 May 2016 13:12:48 -0400 + -- Joey Hess <id@joeyh.name> Mon, 13 Jun 2016 14:57:38 -0400 git-annex (6.20160527) unstable; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index 9f8dc8d26..82eeb68db 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 6.20160527 +Version: 6.20160613 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <id@joeyh.name> |