From 91a4d4c9e556599e0d3eee21b9953f93501aaa3d Mon Sep 17 00:00:00 2001
From: darix <>
Date: Mar 16 2025 20:19:44 +0000
Subject: Update git to version 2.49.0 / rev 321 via SR 1253269
https://build.opensuse.org/request/show/1253269
by user darix + dimstar_suse
- update to 2.49.0
https://about.gitlab.com/blog/2025/03/14/whats-new-in-git-2-49-0/
https://raw.githubusercontent.com/git/git/refs/tags/v2.49.0/Documentation/RelNotes/2.49.0.adoc
- switch to zlib-ng for code 16
- docs switched to asciidoc
---
diff --git a/.files b/.files
index 999545a..4804b29 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index ec067f5..a4e3cb3 100644
--- a/.rev
+++ b/.rev
@@ -2816,4 +2816,81 @@ git 2.12.3
<comment></comment>
<requestid>1202213</requestid>
</revision>
+ <revision rev="317" vrev="1">
+ <srcmd5>809aa64a0a54054f5f3e1cc9bf17fab6</srcmd5>
+ <version>2.47.0</version>
+ <time>1728504216</time>
+ <user>anag+factory</user>
+ <comment>- update to 2.47.0:
+ * https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt
+ * Many Porcelain commands that internally use the merge machinery
+ were taught to consistently honor the diff.algorithm
+ configuration.
+ * A few descriptions in "git show-ref -h" have been clarified.
+ * A 'P' command to "git add -p" that passes the patch hunk to the
+ pager has been added.
+ * "git grep -W" omits blank lines that follow the found function at
+ the end of the file, just like it omits blank lines before the next
+ function.
+ * The value of http.proxy can have "path" at the end for a socks
+ proxy that listens to a unix-domain socket, but we started to
+ discard it when we taught proxy auth code path to use the
+ credential helpers, which has been corrected.
+ * The code paths to compact multiple reftable files have been updated
+ to correctly deal with multiple compaction triggering at the same
+ time.
+ * Support to specify ref backend for submodules has been enhanced.
+ * "git svn" has been taught about svn:global-ignores property
+ recent versions of Subversion has.
+ * The default object hash and ref backend format used to be settable
+ only with explicit command line option to "git init" and
+ environment variables, but now they can be configured in the user's
+ global and system wide configuration.
+ * "git send-email" learned "--translate-aliases" option that reads
+ addresses from the standard input and emits the result of applying
+ aliases on them to the standard output.
+ * 'git for-each-ref' learned a new "--format" atom to find the branch
+ that the history leading to a given commit "%(is-base:<commit>)" is</comment>
+ <requestid>1206497</requestid>
+ </revision>
+ <revision rev="318" vrev="1">
+ <srcmd5>aa65f90c372a61563035c6300564de36</srcmd5>
+ <version>2.47.1</version>
+ <time>1732741540</time>
+ <user>anag+factory</user>
+ <comment></comment>
+ <requestid>1226628</requestid>
+ </revision>
+ <revision rev="319" vrev="1">
+ <srcmd5>b86b8904877ce1632de3feb2bf1a77f0</srcmd5>
+ <version>2.48.0</version>
+ <time>1736868122</time>
+ <user>anag+factory</user>
+ <comment>Forwarded request #1237560 from AndreasStieger
+
+git 2.48.0</comment>
+ <requestid>1237608</requestid>
+ </revision>
+ <revision rev="320" vrev="1">
+ <srcmd5>d2dc7fe783cbc0814aeb18a49c1d7741</srcmd5>
+ <version>2.48.1</version>
+ <time>1737048674</time>
+ <user>anag+factory</user>
+ <comment>- update to 2.48.1: (boo#1235600 boo#1235601)
+ * CVE-2024-50349, CVE-2024-52006:
+ refuse to accept URLs that contain control sequences</comment>
+ <requestid>1238002</requestid>
+ </revision>
+ <revision rev="321" vrev="1">
+ <srcmd5>db8bbc45f40768e768518a86ae87ca39</srcmd5>
+ <version>2.49.0</version>
+ <time>1742147899</time>
+ <user>dimstar_suse</user>
+ <comment>- update to 2.49.0
+ https://about.gitlab.com/blog/2025/03/14/whats-new-in-git-2-49-0/
+ https://raw.githubusercontent.com/git/git/refs/tags/v2.49.0/Documentation/RelNotes/2.49.0.adoc
+- switch to zlib-ng for code 16
+- docs switched to asciidoc</comment>
+ <requestid>1253269</requestid>
+ </revision>
</revisionlist>
diff --git a/git-2.46.1.tar.sign b/git-2.46.1.tar.sign
deleted file mode 100644
index 921e304..0000000
Binary files a/git-2.46.1.tar.sign and /dev/null differ
diff --git a/git-2.46.1.tar.xz b/git-2.46.1.tar.xz
deleted file mode 120000
index 581e052..0000000
--- a/git-2.46.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeigc5mgtssf4uijv3f7jl7meucvyjv7v7i42w2sfpyur56app7qzpa
\ No newline at end of file
diff --git a/git-2.49.0.tar.sign b/git-2.49.0.tar.sign
new file mode 100644
index 0000000..2e034bc
Binary files /dev/null and b/git-2.49.0.tar.sign differ
diff --git a/git-2.49.0.tar.xz b/git-2.49.0.tar.xz
new file mode 120000
index 0000000..2e5c1eb
--- /dev/null
+++ b/git-2.49.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeih5dun4sxfu27t6cqdrid7dbwl4csx75cyzpxcrv3he2vueyrgmnu
\ No newline at end of file
diff --git a/git-asciidoc.patch b/git-asciidoc.patch
index ece0b2b..e046de1 100644
--- a/git-asciidoc.patch
+++ b/git-asciidoc.patch
@@ -1,17 +1,17 @@
---
- Documentation/asciidoc.conf | 2 ++
+ Documentation/asciidoc.conf.in | 2 ++
1 file changed, 2 insertions(+)
-Index: git-2.11.0/Documentation/asciidoc.conf
+Index: git-2.48.0/Documentation/asciidoc.conf.in
===================================================================
---- git-2.11.0.orig/Documentation/asciidoc.conf
-+++ git-2.11.0/Documentation/asciidoc.conf
-@@ -21,6 +21,8 @@ tilde=~
- apostrophe='
- backtick=`
- litdd=--
+--- git-2.48.0.orig/Documentation/asciidoc.conf.in
++++ git-2.48.0/Documentation/asciidoc.conf.in
+@@ -24,6 +24,8 @@ litdd=--
+ manmanual=Git Manual
+ mansource=Git @GIT_VERSION@
+ revdate=@GIT_DATE@
+# drops the "last-updated" footer, with asciidoc-8.6.9+
+footer-style=none
- ifdef::backend-docbook[]
- [linkgit-inlinemacro]
+ ifdef::doctype-book[]
+ [titles]
diff --git a/git.changes b/git.changes
index f02a573..e74ab45 100644
--- a/git.changes
+++ b/git.changes
@@ -1,4 +1,111 @@
-------------------------------------------------------------------
+Fri Mar 14 23:43:43 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- update to 2.49.0
+ https://about.gitlab.com/blog/2025/03/14/whats-new-in-git-2-49-0/
+ https://raw.githubusercontent.com/git/git/refs/tags/v2.49.0/Documentation/RelNotes/2.49.0.adoc
+- switch to zlib-ng for code 16
+- docs switched to asciidoc
+
+-------------------------------------------------------------------
+Tue Jan 14 21:45:04 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 2.48.1: (boo#1235600 boo#1235601)
+ * CVE-2024-50349, CVE-2024-52006:
+ refuse to accept URLs that contain control sequences
+
+-------------------------------------------------------------------
+Mon Jan 13 20:00:00 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 2.48.0
+ * Reference consistency checks: git refs verify
+ * Reflogs can now be migrated with git refs migrate
+ * git is free of memory leaks as covered by the test suite
+ * Performance improvements
+ * Other improvements, UI changes, options extensions and largely
+ compatible behavior changes as listed in
+ https://raw.githubusercontent.com/git/git/refs/tags/v2.48.0/Documentation/RelNotes/2.48.0.txt
+
+-------------------------------------------------------------------
+Mon Nov 25 10:58:31 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 2.47.1:
+ * Use after free and double freeing at the end in
+ "git log -L... -p" had been identified and fixed.
+ * "git maintenance start" crashed due to an uninitialized
+ variable reference, which has been corrected.
+ * Fail gracefully instead of crashing when attempting to write
+ the contents of a corrupt in-core index as a tree object.
+ * A "git fetch" from the superproject going down to a submodule
+ used a wrong remote when the default remote names are set
+ differently between them.
+ * The "gitk" project tree has been synchronized again
+
+-------------------------------------------------------------------
+Wed Oct 9 10:34:12 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.47.0:
+ * https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt
+ * Many Porcelain commands that internally use the merge machinery
+ were taught to consistently honor the diff.algorithm
+ configuration.
+ * A few descriptions in "git show-ref -h" have been clarified.
+ * A 'P' command to "git add -p" that passes the patch hunk to the
+ pager has been added.
+ * "git grep -W" omits blank lines that follow the found function at
+ the end of the file, just like it omits blank lines before the next
+ function.
+ * The value of http.proxy can have "path" at the end for a socks
+ proxy that listens to a unix-domain socket, but we started to
+ discard it when we taught proxy auth code path to use the
+ credential helpers, which has been corrected.
+ * The code paths to compact multiple reftable files have been updated
+ to correctly deal with multiple compaction triggering at the same
+ time.
+ * Support to specify ref backend for submodules has been enhanced.
+ * "git svn" has been taught about svn:global-ignores property
+ recent versions of Subversion has.
+ * The default object hash and ref backend format used to be settable
+ only with explicit command line option to "git init" and
+ environment variables, but now they can be configured in the user's
+ global and system wide configuration.
+ * "git send-email" learned "--translate-aliases" option that reads
+ addresses from the standard input and emits the result of applying
+ aliases on them to the standard output.
+ * 'git for-each-ref' learned a new "--format" atom to find the branch
+ that the history leading to a given commit "%(is-base:<commit>)" is
+ likely based on.
+ * The command line prompt support used to be littered with bash-isms,
+ which has been corrected to work with more shells.
+ * Support for the RUNTIME_PREFIX feature has been added to z/OS port.
+ * "git send-email" learned "--mailmap" option to allow rewriting the
+ recipient addresses.
+ * "git mergetool" learned to use VSCode as a merge backend.
+ * "git pack-redundant" has been marked for removal in Git 3.0.
+ * One-line messages to "die" and other helper functions will get LF
+ added by these helper functions, but many existing messages had an
+ unnecessary LF at the end, which have been corrected.
+ * The "scalar clone" command learned the "--no-tags" option.
+ * The environment GIT_ADVICE has been intentionally kept undocumented
+ to discourage its use by interactive users. Add documentation to
+ help tool writers.
+ * "git apply --3way" learned to take "--ours" and other options.
+
+-------------------------------------------------------------------
+Mon Oct 7 12:01:19 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to version 2.46.2:
+ * Revert the "git patch-id" change that went into 2.46.1,
+ as it seems to have got a regression reported (I haven't verified,
+ but it is better to keep a known breakage than adding an unintended
+ regression).
+ * In a few corner cases "git diff --exit-code" failed to report
+ "changes" (e.g., renamed without any content change), which has
+ been corrected.
+ * The interpret-trailers command failed to recognise the end of the
+ message when the commit log ends in an incomplete line.
+
+-------------------------------------------------------------------
Fri Sep 20 08:18:30 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.46.1;
diff --git a/git.spec b/git.spec
index cddde73..eb2e383 100644
--- a/git.spec
+++ b/git.spec
@@ -1,8 +1,8 @@
#
# spec file for package git
#
-# Copyright (c) 2024 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,7 +43,7 @@
%bcond_with asciidoctor
%endif
Name: git
-Version: 2.46.1
+Version: 2.49.0
Release: 0
Summary: Fast, scalable, distributed revision control system
License: GPL-2.0-only
@@ -86,7 +86,11 @@ BuildRequires: systemd-rpm-macros
BuildRequires: tcsh
BuildRequires: update-desktop-files
BuildRequires: xz
+%if 0%{?suse_version} >= 1600
+BuildRequires: pkgconfig(zlib-ng)
+%else
BuildRequires: pkgconfig(zlib)
+%endif
Requires: git-core = %{version}
Requires: perl-Git = %{version}
Recommends: git-email
@@ -434,9 +438,9 @@ if ! test -f %{buildroot}%{gitexecdir}/git-add; then
fi
mkdir -p "%{buildroot}/%{_docdir}/git" "%{buildroot}/%{_docdir}/git/howto" "%{buildroot}/%{_docdir}/git/technical"
-cp -a README.md Documentation/*.txt "%{buildroot}/%{_docdir}/git/"
-cp -a Documentation/howto/*.txt "%{buildroot}/%{_docdir}/git/howto/"
-cp -a Documentation/technical/*.txt "%{buildroot}/%{_docdir}/git/technical/"
+cp -a README.md Documentation/*.adoc "%{buildroot}/%{_docdir}/git/"
+cp -a Documentation/howto/*.adoc "%{buildroot}/%{_docdir}/git/howto/"
+cp -a Documentation/technical/*.adoc "%{buildroot}/%{_docdir}/git/technical/"
%{!?_without_docs: cp -a Documentation/*.html "%{buildroot}/%{_docdir}/git/"}
%{!?_without_docs: cp -a Documentation/howto/*.html "%{buildroot}/%{_docdir}/git/howto/"}
%{!?_without_docs: cp -a Documentation/technical/*.html "%{buildroot}/%{_docdir}/git/technical/"}