Accepting request 1238002 from devel:tools:scm

- update to 2.48.1: (boo#1235600 boo#1235601)
  * CVE-2024-50349, CVE-2024-52006: 
    refuse to accept URLs that contain control sequences

OBS-URL: https://build.opensuse.org/request/show/1238002
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=320

git-2.45.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
-size 7487680

git-2.48.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c5d545f5dc1eb51e95d2c50d98fdf88b1a36ba1fa30e9ae5d5385c6024f82ad
+size 7723580

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]

git.changes

@@ -1,3 +1,151 @@
+-------------------------------------------------------------------
+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;
+  * "git checkout --ours" (no other arguments) complained that the
+    option is incompatible with branch switching, which is technically
+    correct, but found confusing by some users.  It now says that the
+    user needs to give pathspec to specify what paths to checkout.
+  * It has been documented that we avoid "VAR=VAL shell_func" and why.
+  * "git add -p" by users with diff.suppressBlankEmpty set to true
+    failed to parse the patch that represents an unmodified empty line
+    with an empty line (not a line with a single space on it), which
+    has been corrected.
+  * "git rebase --help" referred to "offset" (the difference between
+    the location a change was taken from and the change gets replaced)
+    incorrectly and called it "fuzz", which has been corrected.
+  * "git notes add -m '' --allow-empty" and friends that take prepared
+    data to create notes should not invoke an editor, but it started
+    doing so since Git 2.42, which has been corrected.
+  * An expensive operation to prepare tracing was done in re-encoding
+    code path even when the tracing was not requested, which has been
+    corrected.
+  * Perforce tests have been updated.
+  * The credential helper to talk to OSX keychain sometimes sent
+    garbage bytes after the username, which has been corrected.
+  * A recent update broke "git ls-remote" used outside a repository,
+    which has been corrected.
+  * "git config --value=foo --fixed-value section.key newvalue" barfed
+    when the existing value in the configuration file used the
+    valueless true syntax, which has been corrected.
+  * "git reflog expire" failed to honor annotated tags when computing
+   reachable commits.
+  * A flakey test and incorrect calls to strtoX() functions have been
+    fixed.
+  * Follow-up on 2.45.1 regression fix.
+  * "git rev-list ... | git diff-tree -p --remerge-diff --stdin" should
+    behave more or less like "git log -p --remerge-diff" but instead it
+    crashed, forgetting to prepare a temporary object store needed.
+  * The patch parser in "git patch-id" has been tightened to avoid
+    getting confused by lines that look like a patch header in the log
+    message.
+  * "git bundle unbundle" outside a repository triggered a BUG()
+    unnecessarily, which has been corrected.
+  * The code forgot to discard unnecessary in-core commit buffer data
+    for commits that "git log --skip=<number>" traversed but omitted
+    from the output, which has been corrected.
+  * "git verify-pack" and "git index-pack" started dying outside a
+    repository, which has been corrected.
+  * A corner case bug in "git stash" was fixed.
+
 -------------------------------------------------------------------
 Wed Aug 28 08:33:45 UTC 2024 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
 

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.0
+Version:        2.48.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only