diff --git a/git-2.29.2.tar.sign b/git-2.29.2.tar.sign deleted file mode 100644 index 615d012..0000000 Binary files a/git-2.29.2.tar.sign and /dev/null differ diff --git a/git-2.29.2.tar.xz b/git-2.29.2.tar.xz deleted file mode 100644 index b68aea2..0000000 --- a/git-2.29.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1 -size 6187988 diff --git a/git-2.30.0.tar.sign b/git-2.30.0.tar.sign new file mode 100644 index 0000000..abc8fcb Binary files /dev/null and b/git-2.30.0.tar.sign differ diff --git a/git-2.30.0.tar.xz b/git-2.30.0.tar.xz new file mode 100644 index 0000000..37291bd --- /dev/null +++ b/git-2.30.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19 +size 6325652 diff --git a/git-zsh-completion-fixes.diff b/git-zsh-completion-fixes.diff index bd7b91e..bd59b44 100644 --- a/git-zsh-completion-fixes.diff +++ b/git-zsh-completion-fixes.diff @@ -2,15 +2,15 @@ contrib/completion/git-completion.zsh | 1 + 1 file changed, 1 insertion(+) -Index: git-2.11.0/contrib/completion/git-completion.zsh +Index: git-2.30.0/contrib/completion/git-completion.zsh =================================================================== ---- git-2.11.0.orig/contrib/completion/git-completion.zsh -+++ git-2.11.0/contrib/completion/git-completion.zsh -@@ -31,6 +31,7 @@ if [ -z "$script" ]; then - local e - locations=( - $(dirname ${funcsourcetrace[1]%:*})/git-completion.bash +--- git-2.30.0.orig/contrib/completion/git-completion.zsh ++++ git-2.30.0/contrib/completion/git-completion.zsh +@@ -36,6 +36,7 @@ if [ -z "$script" ]; then + "$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash + "$HOME/.local/share/bash-completion/completions/git" + "$bash_completion/git" + '/etc/bash_completion.d/git.sh' # suse - '/etc/bash_completion.d/git' # fedora, old debian - '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian - '/usr/share/bash-completion/git' # gentoo + '/etc/bash_completion.d/git' # old debian + ) + for e in $locations; do diff --git a/git.changes b/git.changes index 2700027..60e9a35 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 29 19:30:29 UTC 2020 - Andreas Stieger + +- git 2.30.0: + * Userdiff updates for PHP, Rust, CSS + * New features and options to multiple subcommands and workflows + * Avoid administrator error leading to data loss with + "git push --force-with-lease[=]" by introducing + "--force-if-includes" + * Updates to shell autocompletion + * Bug fixes and internal improvements + ------------------------------------------------------------------- Fri Nov 20 21:53:07 UTC 2020 - Marcus Rueckert diff --git a/git.spec b/git.spec index 49552cd..af22efe 100644 --- a/git.spec +++ b/git.spec @@ -39,7 +39,7 @@ %endif Name: git -Version: 2.29.2 +Version: 2.30.0 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only @@ -91,8 +91,8 @@ Suggests: git-web BuildRequires: sgml-skel BuildRequires: xmlto %if %{with asciidoctor} -BuildRequires: docbook5-xsl-stylesheets BuildRequires: %{rubygem asciidoctor} +BuildRequires: docbook5-xsl-stylesheets %else BuildRequires: asciidoc %endif