diff --git a/git-2.31.1.tar.sign b/git-2.31.1.tar.sign deleted file mode 100644 index dbb633c..0000000 Binary files a/git-2.31.1.tar.sign and /dev/null differ diff --git a/git-2.31.1.tar.xz b/git-2.31.1.tar.xz deleted file mode 100644 index ad9edfc..0000000 --- a/git-2.31.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680 -size 6413368 diff --git a/git-2.32.0.tar.sign b/git-2.32.0.tar.sign new file mode 100644 index 0000000..6de14e3 Binary files /dev/null and b/git-2.32.0.tar.sign differ diff --git a/git-2.32.0.tar.xz b/git-2.32.0.tar.xz new file mode 100644 index 0000000..705fcc5 --- /dev/null +++ b/git-2.32.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623 +size 6551348 diff --git a/git.changes b/git.changes index c585c39..73ce709 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Jun 6 15:30:14 UTC 2021 - Andreas Stieger + +- git 2.32.0: + * ".gitattributes", ".gitignore", and ".mailmap" files that are + symbolic links are ignored + * "git apply --3way" used to first attempt a straight + application, and only fell back to the 3-way merge algorithm + when the straight application failed. Starting with this + version, the command will first try the 3-way merge algorithm + and only when it fails (either resulting with conflict or the + base versions of blobs are missing), falls back to the usual + patch application. + * "git stash show" can now show the untracked part of the stash + * Improved "git repack" strategy + * http code can now unlock a certificate with a cached password + respectively. + * "git clone --reject-shallow" option fails the clone as soon as + we notice that we are cloning from a shallow repository. + * "gitweb" learned "e-mail privacy" feature + * Multiple improvements to output and configuration options + * Bug fixes and developer visible fixes + ------------------------------------------------------------------- Thu Apr 22 13:28:06 UTC 2021 - Markéta Machová diff --git a/git.spec b/git.spec index b19433a..2abd547 100644 --- a/git.spec +++ b/git.spec @@ -36,7 +36,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.31.1 +Version: 2.32.0 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only @@ -74,10 +74,6 @@ BuildRequires: perl-Error BuildRequires: perl-MailTools BuildRequires: python3-base BuildRequires: systemd-rpm-macros -%if 0%{?suse_version} >= 1500 -BuildRequires: system-user-nobody -BuildRequires: sysuser-tools -%endif BuildRequires: tcsh BuildRequires: update-desktop-files BuildRequires: xz @@ -91,6 +87,10 @@ Recommends: git-svn Recommends: gitk Suggests: git-daemon Suggests: git-web +%if 0%{?suse_version} >= 1500 +BuildRequires: system-user-nobody +BuildRequires: sysuser-tools +%endif %if %{with docs} BuildRequires: sgml-skel BuildRequires: xmlto @@ -126,12 +126,12 @@ CVS, and GNU arch. Summary: Core git tools Group: Development/Tools/Version Control Requires: less +Obsoletes: git-remote-helpers < %{version} %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 Requires: openssh-clients %else Requires: openssh %endif -Obsoletes: git-remote-helpers < %{version} %description core Git is a fast, scalable, distributed revision control system with an @@ -143,8 +143,8 @@ These are the core tools with minimal dependencies. %package -n perl-Git Summary: perl Bindings for Git Group: Development/Libraries/Perl -Provides: git-core:%{perl_vendorlib}/Git Requires: perl-Error +Provides: git-core:%{perl_vendorlib}/Git %{perl_requires} %description -n perl-Git @@ -246,6 +246,8 @@ Email interface for the GIT version control system. %package daemon Summary: Simple Server for Git Repositories Group: Development/Tools/Version Control +Requires: git-core = %{version} +Requires(pre): %fillup_prereq %if 0%{?suse_version} >= 1550 Requires(pre): group(nobody) %sysusers_requires @@ -254,8 +256,6 @@ Requires(pre): group(nobody) Requires(pre): %{_sbindir}/useradd Requires(pre): shadow %endif -Requires: git-core = %{version} -Requires(pre): %fillup_prereq %description daemon A really simple TCP git daemon. In the default configuration it allows @@ -267,7 +267,7 @@ Summary: Git revision tree visualiser Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 -Supplements: packageand(git-core:tk) +Supplements: (git-core and tk) %description -n gitk Grapical tool for visualization of revision trees of projects @@ -282,7 +282,7 @@ Summary: Grapical tool for common git operations Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 -Supplements: packageand(git-core:tk) +Supplements: (git-core and tk) %description gui A Tcl/Tk based graphical user interface to Git. git-gui focuses on @@ -300,7 +300,7 @@ Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: perl-CGI Requires: perl-Git = %{version} -Supplements: packageand(git-core:apache2) +Supplements: (git-core and apache2) %description web CGI script that allows browsing git repositories via web interface. @@ -548,8 +548,8 @@ fi %{_sysconfdir}/apparmor.d %{gitexecdir}//git-instaweb %{gitexecdir}//git-web--browse -%{_mandir}/man1/*web*1* -%{_mandir}/man5/*web*5* +%{_mandir}/man1/*web*1%{?ext_man} +%{_mandir}/man5/*web*5%{?ext_man} %files core -f bin-man-doc-files %license COPYING