From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] git: Update version to 2.34.1
Date: Wed, 08 Dec 2021 09:56:00 +0000
Message-ID: <7D329DF5-FF97-41F0-943E-F460315FD78C@ipfire.org>
In-Reply-To: <20211207173558.1918586-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6580516493402340231=="
List-Id: <development.lists.ipfire.org>

--===============6580516493402340231==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 7 Dec 2021, at 17:35, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - Update from 2.33.1 to 2.34.1
> - Update of rootfile - The "--preserve-merges" option of "git rebase" has b=
een removed.
> - Changelog is too large to include here.
>   The changes for version 2.34.0 can be found in the source tarball in
>   Documentation/RelNotes/2.34.0.txt and for version 2.34.1 in
>   Documentation/RelNotes/2.34.1.txt
>=20
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/packages/git | 1 -
> lfs/git                       | 6 +++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>=20
> diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
> index 67e2015bc..0c803e964 100644
> --- a/config/rootfiles/packages/git
> +++ b/config/rootfiles/packages/git
> @@ -121,7 +121,6 @@ usr/libexec/git-core/git-quiltimport
> usr/libexec/git-core/git-range-diff
> usr/libexec/git-core/git-read-tree
> usr/libexec/git-core/git-rebase
> -usr/libexec/git-core/git-rebase--preserve-merges
> usr/libexec/git-core/git-receive-pack
> usr/libexec/git-core/git-reflog
> usr/libexec/git-core/git-remote
> diff --git a/lfs/git b/lfs/git
> index 59610a6a1..ca9bfc1d5 100644
> --- a/lfs/git
> +++ b/lfs/git
> @@ -24,7 +24,7 @@
>=20
> include Config
>=20
> -VER        =3D 2.33.1
> +VER        =3D 2.34.1
>=20
> THISAPP    =3D git-$(VER)
> DL_FILE    =3D $(THISAPP).tar.xz
> @@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET     =3D $(DIR_INFO)/$(THISAPP)
> PROG       =3D git
> -PAK_VER    =3D 20
> +PAK_VER    =3D 21
>=20
> DEPS       =3D perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
>=20
> @@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
>=20
> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>=20
> -$(DL_FILE)_MD5 =3D 3462f34d9c17288eee854b7645f6a0a1
> +$(DL_FILE)_MD5 =3D f442dade3c73ea39473f6700b3e04dcd
>=20
> install : $(TARGET)
>=20
> --=20
> 2.34.1
>=20


--===============6580516493402340231==--