Sync from SUSE:SLFO:Main git revision 0e96b625338dcd4070f8d2d934213082

git.changes

@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+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

@@ -43,7 +43,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.46.0
+Version:        2.46.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only