From 204ea3ebf5b7d756ed39a6af341b0b96a0ecaf4f460e408500e51e0756bbd94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 22 Jun 2021 15:19:22 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:94, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=43 --- git-annex-8.20210428.tar.gz | 3 --- git-annex-8.20210621.tar.gz | 3 +++ git-annex.changes | 43 +++++++++++++++++++++++++++++++++++++ git-annex.spec | 2 +- 4 files changed, 47 insertions(+), 4 deletions(-) delete mode 100644 git-annex-8.20210428.tar.gz create mode 100644 git-annex-8.20210621.tar.gz diff --git a/git-annex-8.20210428.tar.gz b/git-annex-8.20210428.tar.gz deleted file mode 100644 index 8593c49..0000000 --- a/git-annex-8.20210428.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f25d7e80445387595585573134f89752d2a889fdffd73a48e5d49eadb625b3c2 -size 8765307 diff --git a/git-annex-8.20210621.tar.gz b/git-annex-8.20210621.tar.gz new file mode 100644 index 0000000..db1d317 --- /dev/null +++ b/git-annex-8.20210621.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af2bf919980a70c9474c671252fa96acf19cce6adcbf196cb784997f54206aba +size 8891295 diff --git a/git-annex.changes b/git-annex.changes index beef849..90bb200 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Tue Jun 22 07:42:31 UTC 2021 - psimons@suse.com + +- Update git-annex to version 8.20210621. + git-annex (8.20210621) upstream; urgency=medium + + * New matching options --excludesamecontent and --includesamecontent + * When two files have the same content, and a required content expression + matches one but not the other, dropping the latter file will fail as it + would also remove the content of the required file. + * drop, move, mirror: When two files have the same content, and + different numcopies or requiredcopies values, use the higher value. + * drop --auto: When two files have the same content, and a preferred content + expression matches one but not the other, do not drop the content. + * sync --content, assistant: When two unlocked files have the same + content, and a preferred content expression matches one but not the + other, do not drop the content. (This was already the case for locked + files.) + * sync --content, assistant: Fix an edge case where a file that is not + preferred content did not get dropped. + * filter-branch: New command, useful to produce a filtered version of the + git-annex branch, eg when splitting a repository. + * fromkey: Create an unlocked file when used in an adjusted branch + where the file should be unlocked, or when configured by annex.addunlocked. + * Fix behavior of several commands, including reinject, addurl, and rmurl + when given an absolute path to an unlocked file, or a relative path + that leaves and re-enters the repository. + * smudge: Fix a case where an unlocked annexed file that annex.largefiles + does not match could get its unchanged content checked into git, + due to git running the smudge filter unecessarily. + * reinject: Error out when run on a file that is not annexed, rather + than silently skipping it. + * assistant: Fix a crash on startup by avoiding using forkProcess. + * init: When annex.commitmessage is set, use that message for the commit + that creates the git-annex branch. + * Added annex.adviceNoSshCaching config. + * Added --size-limit option. + * Future proof activity log parsing. + * Fix an exponential slowdown when large numbers of duplicate files are + being added in unlocked form. + + -- Joey Hess Mon, 21 Jun 2021 12:17:24 -0400 + ------------------------------------------------------------------- Thu Apr 29 09:42:49 UTC 2021 - Ondřej Súkup diff --git a/git-annex.spec b/git-annex.spec index 029cca6..4a1dbe3 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,7 +17,7 @@ Name: git-annex -Version: 8.20210428 +Version: 8.20210621 Release: 0 Summary: Manage files with git, without checking their contents into git License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only