From 17fafd160b4cb66e09e87dc0fecc80ca75ae1fdff98ee568e40dd2a5791cd278 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 9 Jul 2022 14:58:55 +0000
Subject: [PATCH] Accepting request 987497 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/987497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=281
---
 git-2.36.1.tar.sign                    | Bin 566 -> 0 bytes
 git-2.36.1.tar.xz                      |   3 ---
 git-2.37.0.tar.sign                    | Bin 0 -> 566 bytes
 git-2.37.0.tar.xz                      |   3 +++
 git.changes                            |   8 ++++++++
 git.spec                               |   7 ++-----
 suse-use-builtin-add-interactive.patch |  18 ------------------
 7 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 git-2.36.1.tar.sign
 delete mode 100644 git-2.36.1.tar.xz
 create mode 100644 git-2.37.0.tar.sign
 create mode 100644 git-2.37.0.tar.xz
 delete mode 100644 suse-use-builtin-add-interactive.patch

diff --git a/git-2.36.1.tar.sign b/git-2.36.1.tar.sign
deleted file mode 100644
index 3c93281343b3fe6247832f41cc7c162c1e7cca5ce571f0a973565949f24e5fe2..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%CMV6aWed5U{oA
zhL*49%R+t+|7v(oS2}c5O%<}1U6`ITFx=a&w6mmZgPC`YDWCC?)ic7c6N;;Sz*10`
zp}hzYQqsCBGxX`+_y;IXaYds3|K7t|q7{fwv}oKRVFnoEN32=%jyOTf(C0hd(FCI2
zQ3VzyXtlVfa7fWXp(__OZobJ^^Ql8IWL_g#5&2BuB^i%y0~OVAtH$-f7THncGgm^6
zd*j2QdVt$-g<AAS_~W%9m6xDc!yQ&(g30xvEonz9&%%3SuZry}&1P`5%}ZvXi1*$I
z2$xE`t=<CP1AJiTE%)d6IF`2{nG*JfN~u_moWP$m;|s@0F0~dgiIF7k!erc{wmxRM
z`~xf`bKX4`o1p~31PivJd$2(-eLFPS!`U6{Isv-mfS{%j;F^8-SDa}BFWmtcj>}Qh
zflNb=MLfjs8G{?t%wx42Lpji}d|E($K8Zud0vuv2lS~N4_wo>R31|U&q(chT3gRLU
zj-eO=;)A5XE*hqvk>WA?tiz8?=lUSr+kcTWrsX*kOYq=wZWjmr?Pq#~$Pgm8vMue<
zh&kBl|F!@}dAF(ucPRgGCnH}Kfo~kRiD#&;a;%oQ;Wwtx1`M0%EvKdfj&HWkGlmHR
zuHk)^tuA22mKU^&G+r7E!x{wD5(oJQ|DqQFYD9smIEAASHV*k_XW)T*0x9;X6ac3Q
Ecx#vsr~m)}

diff --git a/git-2.36.1.tar.xz b/git-2.36.1.tar.xz
deleted file mode 100644
index 7dea44b..0000000
--- a/git-2.36.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370
-size 7004044
diff --git a/git-2.37.0.tar.sign b/git-2.37.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..d822c8b6996a7082c543f862d455f4df5d428d65be87189765e78ee2ace8dd01
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%E!4L;wm25U{oA
zhL*49%QOWL0OGrIs64d%aj)|BLPrUl+DaD4;oWRm8_W-XK`v;6Ox3Ay{^u6>aJB2Y
z+M<12lwYo6mru6}wtPlvUGib`1snRus+!XQi)Qd%PP&`=*2+#<z*F@4`WDkLZC<_&
zb{)?uv|!E3t0HY7%C`&SZg=gyvYNZW2h@FxMl!5=tWS+1!=Ko+NOySbDh{y1lpfo(
z$<N61+7-X_9L*u5j5t_jKrbLeQEE-FWwd$)JNTv$&9^<0#LmDH5pJ*B$3`IsbM*qm
zO3p^I%OO4NgpADKkcUg=UcZMuy!}e(pUPwU%)=L|g%XQLIlRq`_PKBzgg$o_kt6Ns
z-)d~upb<sXx6cZFUZAF>aDnHluDCs+-LsmXib4vz9r)UR=hO|>042U2e3W|j_bYD1
zTmUva{p`sGFwDvoaN41-uZQ9&A_gzxpCdXL#qxfSGxZ3hGN^PPhiPztk`&tXsN(8J
z749EBA4{>2>FNtTW|uKPATm#!mD+L*r-@Xiy$cp+34(u=a|LDBm5>0T(5&qB<O4+6
zj#ga(yZ(;%0=2H8LL0Ie{Z%{Vr0llu-CKrMq2QiF`q4;Av`0lONTUO(ao<(5aU`*E
zHHS_Po?*Z%fI}6aDnmr1Oxs-~5`B#c0W4i@?nCxYmLaHDh!~Rwyy2t{xataR8fTM(
Ey5?6LVE_OC

literal 0
HcmV?d00001

diff --git a/git-2.37.0.tar.xz b/git-2.37.0.tar.xz
new file mode 100644
index 0000000..d87b385
--- /dev/null
+++ b/git-2.37.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f7fa1711bd00c4ec3dde2fe44407dc13f12e4772b5e3c72a58db4c07495411f
+size 6978796
diff --git a/git.changes b/git.changes
index 4a3acd2..496daff 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul  7 07:50:07 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Update git to 2.37.0:
+  https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.37.0.txt
+- git add --interactive is now default upstream, remove suse patch:
+  * suse-use-builtin-add-interactive.patch
+
 -------------------------------------------------------------------
 Wed Jun 15 19:39:55 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
 
diff --git a/git.spec b/git.spec
index 18ba0ed..1e027ed 100644
--- a/git.spec
+++ b/git.spec
@@ -36,7 +36,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.36.1
+Version:        2.37.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -53,8 +53,6 @@ Source8:        %{name}.keyring
 Source9:        %{name}-gui.desktop
 Source10:       %{name}-gui.png
 Source11:       git-daemon.conf
-# PATCH-FIX-SUSE: Default to builtin add -i mode to avoid perl dependency
-Patch2:         suse-use-builtin-add-interactive.patch
 Patch3:         completion-wordbreaks.diff
 # CVE-2011-2186, bnc#698456
 Patch4:         git-prevent_xss-default.diff
@@ -320,8 +318,7 @@ The apache2 configuration contained in this package installs a virtual
 directory /git/ that calls the cgi script.
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 
 %build
 cat > .make <<'EOF'
diff --git a/suse-use-builtin-add-interactive.patch b/suse-use-builtin-add-interactive.patch
deleted file mode 100644
index e7ac0d7..0000000
--- a/suse-use-builtin-add-interactive.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- git-2.31.1/builtin/add.c	2021-03-26 23:03:34.000000000 +0100
-+++ git-2.31.1/builtin/add.c	2021-04-08 13:15:09.004425194 +0200
-@@ -208,9 +208,14 @@
- 		else if (!git_config_get_bool("feature.experimental", &experimental) &&
- 			 experimental)
- 			use_builtin_add_i = 1;
-+		else
-+			use_builtin_add_i = 1;
- 	}
- 
--	if (use_builtin_add_i == 1) {
-+	/* SUSE oddity - git-add--interactive is the single remaining perl dependency of
-+	 * git-core - so we opt to default to the builtin interactive shell and strip it.
-+	 * Please let us know at https://bugzilla.suse.com/ if there is an issue with this.*/
-+	if (use_builtin_add_i != 0) {
- 		enum add_p_mode mode;
- 
- 		if (!patch_mode)