[packages/git-core] up to 2.49.0
atler
atler at pld-linux.org
Sat Mar 15 03:09:19 CET 2025
commit 8be95bda63335d2dd910aca4d2e193d798883ac2
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Mar 15 01:21:06 2025 +0100
up to 2.49.0
git-core.spec | 6 ++----
tests-mksh-compat.patch | 40 ----------------------------------------
2 files changed, 2 insertions(+), 44 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index 43d0149..0705aa7 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -13,12 +13,12 @@
Summary: Distributed version control system focused on speed, effectivity and usability
Summary(pl.UTF-8): Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
Name: git-core
-Version: 2.48.1
+Version: 2.49.0
Release: 1
License: GPL v2
Group: Development/Tools
Source0: https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: 99656f1481e70701198257ada703a480
+# Source0-md5: 7e607007a44de52cccda06040fe9362c
Source1: %{name}-gitweb.conf
Source2: %{name}-gitweb-httpd.conf
Source3: %{name}-gitweb-lighttpd.conf
@@ -30,7 +30,6 @@ Patch0: %{name}-key-bindings.patch
Patch1: %{name}-sysconfdir.patch
Patch2: cherry-picked-commitlog.patch
Patch3: no-meson-test-check.patch
-Patch4: tests-mksh-compat.patch
URL: http://git-scm.com/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -454,7 +453,6 @@ Dopełnianie parametrów komendy git dla powłoki zsh.
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
-%patch -P4 -p1
# we build things in contrib but want to have it clean for doc purporses, too
cp -a contrib contrib-doc
diff --git a/tests-mksh-compat.patch b/tests-mksh-compat.patch
deleted file mode 100644
index 12a398b..0000000
--- a/tests-mksh-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 17e4160cac5807e55057d88c4d53850c2a660ec6 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Sat, 11 Jan 2025 23:11:12 +0100
-Subject: [PATCH] t8002-blame: simplify padding generation in blank boundary
- tests
-
-Fixes compatibility with mksh as well:
-$ mksh -c 'printf "%0.s" ""'
-printf: %0.s: invalid conversion specification
-
-Fixes: e7fb2ca945 ("builtin/blame: fix out-of-bounds write with blank boundary commits")
----
- t/t8002-blame.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
-index 1ad039e123..e98993276a 100755
---- a/t/t8002-blame.sh
-+++ b/t/t8002-blame.sh
-@@ -138,7 +138,7 @@ test_expect_success 'blame --abbrev -b truncates the blank boundary' '
- # Note that `--abbrev=` always gets incremented by 1, which is why we
- # expect 11 leading spaces and not 10.
- cat >expect <<-EOF &&
-- $(printf "%0.s " $(test_seq 11)) (<author at example.com> 2005-04-07 15:45:13 -0700 1) abbrev
-+ $(printf "%11s" "") (<author at example.com> 2005-04-07 15:45:13 -0700 1) abbrev
- EOF
- git blame -b --abbrev=10 ^HEAD -- abbrev.t >actual &&
- test_cmp expect actual
-@@ -146,7 +146,7 @@ test_expect_success 'blame --abbrev -b truncates the blank boundary' '
-
- test_expect_success 'blame with excessive --abbrev and -b culls to hash length' '
- cat >expect <<-EOF &&
-- $(printf "%0.s " $(test_seq $hexsz)) (<author at example.com> 2005-04-07 15:45:13 -0700 1) abbrev
-+ $(printf "%${hexsz}s" "") (<author at example.com> 2005-04-07 15:45:13 -0700 1) abbrev
- EOF
- git blame -b --abbrev=9000 ^HEAD -- abbrev.t >actual &&
- test_cmp expect actual
---
-2.48.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/8be95bda63335d2dd910aca4d2e193d798883ac2
More information about the pld-cvs-commit
mailing list