From 9b7ff2676ac8c92188b52e44fdc3ffd490b1fde03a71f2031b657c474b459dec Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Sat, 4 Nov 2023 18:27:28 +0000
Subject: [PATCH] Accepting request 1123323 from
 home:AndreasStieger:branches:devel:tools:scm

git 2.24.1

OBS-URL: https://build.opensuse.org/request/show/1123323
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=626
---
 git-2.42.0.tar.sign | Bin 566 -> 0 bytes
 git-2.42.0.tar.xz   |   3 ---
 git-2.42.1.tar.sign | Bin 0 -> 566 bytes
 git-2.42.1.tar.xz   |   3 +++
 git.changes         |   9 +++++++++
 git.spec            |   2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 git-2.42.0.tar.sign
 delete mode 100644 git-2.42.0.tar.xz
 create mode 100644 git-2.42.1.tar.sign
 create mode 100644 git-2.42.1.tar.xz

diff --git a/git-2.42.0.tar.sign b/git-2.42.0.tar.sign
deleted file mode 100644
index 881d0a3b8c645bdd916ae64853f5258d633f808dbb2c204a66cf8a35fcfc8747..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%YT#5daDa5U{oA
zhL*49%NP+4|9UY7Td;y<zvCMEhQEWeOG0|cw$QIA5%rtBA?<OODBYq?9A~Phb%@QG
z;FC{rL+JIJkzw)!R!ydJ9!vupa&VNx6*77z&Q@Am(?l~YOm&RxawS@_R|85kbdoon
zCjJ2BMuAqaA&n}C>jGw2%wp(&43gJ<nZo55*pywiXbKS>HN$y+?Fo!qmiCWNclkY3
zH2gDDl%l<cs8_H8{F~+^%SY^u_)bZRy1Zi1aVn~|L$T_+@@|_bg_{G@TyT0%K5luJ
z&f4>#(rX-$;p`+(cm8=(;qdm7SgDXpLne%=x2Vd1)gNU;6O=tn7{pKFLDn6*Mk7WT
zHr=k+p*zQ<cR_Frv=|8B)o!WAbwrd@%Y1arB)^Z7KSf&}Xq12}xrp5knEt`In!&p2
ze!m%zHM%x+<X7~{dVy||jU+RiKh=3NaN1`dmkTh`XSmA(k}{NF3Q2R~jiD2<I*4Vf
z2uyR>v1rIpnwI~b3aynN38ZS>kI5>KhVL34H2*bt?UBa}u1{3)9(XNNLQA9e?82=X
zU=kL&y{g0f`(k5YS6oF~<<y;>S&rJnV|$wcq3qi5VOh)GlP)`hObqu&jZygOKQHuk
zyP?|5>kPhCA|&I2rQ(h0bKW;sm{f6dOvBaZxbP4-4P(1}<RUy^q72Z|sGs!Lz9yJb
EK#l|(0ssI2

diff --git a/git-2.42.0.tar.xz b/git-2.42.0.tar.xz
deleted file mode 100644
index 4c529fa..0000000
--- a/git-2.42.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3278210e9fd2994b8484dd7e3ddd9ea8b940ef52170cdb606daa94d887c93b0d
-size 7346760
diff --git a/git-2.42.1.tar.sign b/git-2.42.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..55a360454f4c809ec0a036e505a9f901d221a61260631b8fe3ed32cad3423ee2
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%b#B(f|qx5U{oA
zhL*49%d9;Q{wzN%u_t9~X20OJ9kkktF8iKplGm%D>kbrRmzQUO{j$SR741M7T|$3X
z6Q2jhe9d(cg-*RlcoRE<A$|O`yNICWfsZ<~dg>?HE1ufQnc!tlmMTBQCwSw{rOxIj
zgVU_MIBEoA0G9yoQ14NaQ-Df)m35-)Y<*7C*lVRc&enjjk3KQ8GpJ8%rdim2uN-K@
zAthu7A`|(1eL-SVmt{4_P$fK@aDlc*IfF4Tma%*I7MT7x12(@R(g<Cl=Bf(W;qq<B
z&Br_v)P^rtM;5=lz`mNg-F@CKN%pYQRaQ&_y!cJU;oh%;?GQ`*3EOI&uXKJa;B@_3
zU2f=I3p~^sxKV&v+~3DvV8j@mo=Np@S8Ye#XF%sRIWJX`QpcIXV7?S27!T%pgQ@CZ
z)6_Cpl22_hVb6Yatv^1y45sv2jswakt%S;`%PZ$w@A6#859fbG0N+7kPqH#6JgqJI
zD7({WwShz%D~?K+vUa81nij0c?g*kgg(BA>vxt35&pnEC1w*jmR@Bg4u8UkXdh~L}
zk*{RJJD1Xy=7NIAXYSTjLT#Kq1R<D=@hRXIc9N<_Yo|x;@TUA|#{aBnE}M6u&AiR+
zRIGP>Zlv6jnZk2uD-}{mnimr3`kedkkB-K(Lj-F{rP1-E<Va|wh?osFogSSEocbKh
Em%xV|V*mgE

literal 0
HcmV?d00001

diff --git a/git-2.42.1.tar.xz b/git-2.42.1.tar.xz
new file mode 100644
index 0000000..6e392fd
--- /dev/null
+++ b/git-2.42.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e46fa96bf35a65625d85fde50391e39bc0620d1bb39afb70b96c4a237a1a4f7
+size 7351412
diff --git a/git.changes b/git.changes
index e1a41de..a8da0ea 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov  4 12:15:19 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.24.1:
+  * The usual number of bug fixes, including
+  * Fix "git diff" exit code handling 
+  * Various fixes to the behavior of "rebase -i" when the command
+    got interrupted by conflicting changes
+
 -------------------------------------------------------------------
 Mon Oct 23 12:42:40 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/git.spec b/git.spec
index 798bef5..39ea8a8 100644
--- a/git.spec
+++ b/git.spec
@@ -35,7 +35,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.42.0
+Version:        2.42.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only