From 361ca73bf9291fc4e4e435e969a0a86d2a02eae2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Sep 2016 09:46:19 -0400 Subject: add news item for git-annex 6.20160923 --- doc/news/version_6.20160613.mdwn | 34 ---------------------------------- doc/news/version_6.20160923.mdwn | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 doc/news/version_6.20160613.mdwn create mode 100644 doc/news/version_6.20160923.mdwn diff --git a/doc/news/version_6.20160613.mdwn b/doc/news/version_6.20160613.mdwn deleted file mode 100644 index db338b211..000000000 --- a/doc/news/version_6.20160613.mdwn +++ /dev/null @@ -1,34 +0,0 @@ -git-annex 6.20160613 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Improve SHA*E extension extraction code. - * Windows: Avoid terminating git-annex branch lines with \r\n when - union merging and performing transitions. - * Remove Makefile from cabal tarball; man page building is now handled by - a small haskell program. - * sync --content: Fix bug that caused transfers of files to be made - to a git remote that does not have a UUID. This particularly impacted - clones from gcrypt repositories. - * 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. - * 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. - * 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 - sync.) - * v6: Make lock and unlock work on files whose content is not present. - * 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."""]] \ No newline at end of file diff --git a/doc/news/version_6.20160923.mdwn b/doc/news/version_6.20160923.mdwn new file mode 100644 index 000000000..d74ef61fe --- /dev/null +++ b/doc/news/version_6.20160923.mdwn @@ -0,0 +1,34 @@ +git-annex 6.20160923 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Rate limit console progress display updates to 10 per second. + Was updating as frequently as changes were reported, up to hundreds of + times per second, which used unncessary bandwidth when running git-annex + over ssh etc. + * Make --json and --quiet work when used with -J. + Previously, -J override the other options. + * addurl, get: Added --json-progress option, which adds progress + objects to the json output. + * Remove key:null from git-annex add --json output. + * copy, move, mirror: Support --json and --json-progress. + * Improve gpg secret key list parser to deal with changes in gpg 2.1.15. + Fixes key name display in webapp. + * info: Support being passed a treeish, and show info about the annexed + files in it similar to how a directory is handled. + * sync: Previously, when run in a branch with a slash in its name, + such as "foo/bar", the sync branch was "synced/bar". That conflicted + with the sync branch used for branch "bar", so has been changed to + "synced/foo/bar". + * Note that if you're using an old version of git-annex to sync with + a branch with a slash in its name, it won't see some changes synced by + this version, and this version won't see some changes synced by the older + version. This is not a problem if there's a central bare repository, + but may impact other configurations until git-annex is upgraded to this + version. + * adjust: Previously, when adjusting a branch with a slash in its name, + such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)". + That conflicted with the adjusted branch used for branch "bar", + so has been changed to "adjusted/foo/bar(unlocked)" + * Also, running sync in an adjusted branch did not correctly sync + changes back to the parent branch when it had a slash in its name. + This bug has been fixed. + * addurl, importfeed: Improve behavior when file being added is gitignored."""]] \ No newline at end of file -- cgit v1.2.3