From 4615c270c92954a61d90d2f3a3a45bda6f768b1b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Feb 2020 13:13:13 -0400 Subject: [PATCH 1/3] remove unused import (cherry picked from commit 1f0fc9ff5f310e867b69d20693bd197199564bad) --- Git/LsTree.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/Git/LsTree.hs b/Git/LsTree.hs index 94c56728c4..5175c39024 100644 --- a/Git/LsTree.hs +++ b/Git/LsTree.hs @@ -21,7 +21,6 @@ module Git.LsTree ( import Common import Git import Git.Command -import Git.Sha import Git.FilePath import qualified Git.Filename import Utility.Attoparsec From 5b4ba5c6a54bc1621d7f2461e5f9730f7fda4c68 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Feb 2020 18:40:45 -0400 Subject: [PATCH 2/3] add news item for git-annex 7.20200226 --- doc/news/version_7.20191114.mdwn | 10 ---------- doc/news/version_7.20200226.mdwn | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 doc/news/version_7.20191114.mdwn create mode 100644 doc/news/version_7.20200226.mdwn diff --git a/doc/news/version_7.20191114.mdwn b/doc/news/version_7.20191114.mdwn deleted file mode 100644 index 6dfb3401e3..0000000000 --- a/doc/news/version_7.20191114.mdwn +++ /dev/null @@ -1,10 +0,0 @@ -git-annex 7.20191114 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Added annex.allowsign option. - * Make --json-error-messages capture more errors, - particularly url download errors. - * Fix a crash (STM deadlock) when -J is used with multiple files - that point to the same key. - * linuxstandalone: Fix a regression that broke git-remote-https. - * OSX git-annex.app: Fix a problem that prevented using the bundled - git-remote-https, git-remote-http, and git-shell."""]] \ No newline at end of file diff --git a/doc/news/version_7.20200226.mdwn b/doc/news/version_7.20200226.mdwn new file mode 100644 index 0000000000..1e363419e5 --- /dev/null +++ b/doc/news/version_7.20200226.mdwn @@ -0,0 +1,24 @@ +News for git-annex 7.20200226: + + There was a serious regression in gcrypt and encrypted git-lfs remotes. + Since version 7.20200202.7, git-annex incorrectly stored content + on those remotes without encrypting it. + If your remotes are affected, you will want to make sure to delete + any content that git-annex has stored on them that is not encrypted! + One way to do so is, before upgrading to this version, + run git-annex move --from the affected remotes. It will move + only the content that was not encrypted. + +git-annex 7.20200226 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix serious regression in gcrypt and encrypted git-lfs remotes. + Since version 7.20200202.7, git-annex incorrectly stored content + on those remotes without encrypting it. + If your remotes are affected, you will want to make sure to delete + any content that git-annex has stored on them that is not encrypted! + * info: Fix display of the encryption value. + (Some debugging junk had crept in.) + * Bugfix to getting content from an export remote with -J, when the + export database was not yet populated. + * Bugfix: export --tracking (a deprecated option) set + annex-annex-tracking-branch, instead of annex-tracking-branch."""]] \ No newline at end of file From f2a50a99440c807523a96b473b781a9cde6dd049 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Feb 2020 18:42:34 -0400 Subject: [PATCH 3/3] version --- git-annex.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annex.cabal b/git-annex.cabal index b01cac4f54..88de120330 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 7.20200219 +Version: 7.20200226 Cabal-Version: >= 1.8 License: AGPL-3 Maintainer: Joey Hess