From cac22aa92d3d22cc784896a4dc6bac0cb660fe174bc6443f75a34d7fe54c20c6 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 14 Mar 2023 08:47:54 +0000
Subject: [PATCH] Accepting request 1071233 from
 home:AndreasStieger:branches:devel:tools:scm

git 2.40.0

OBS-URL: https://build.opensuse.org/request/show/1071233
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=610
---
 completion-wordbreaks.diff |  12 ++++++------
 git-2.39.2.tar.sign        | Bin 566 -> 0 bytes
 git-2.39.2.tar.xz          |   3 ---
 git-2.40.0.tar.sign        | Bin 0 -> 566 bytes
 git-2.40.0.tar.xz          |   3 +++
 git.changes                |  18 ++++++++++++++++++
 git.spec                   |   5 +----
 7 files changed, 28 insertions(+), 13 deletions(-)
 delete mode 100644 git-2.39.2.tar.sign
 delete mode 100644 git-2.39.2.tar.xz
 create mode 100644 git-2.40.0.tar.sign
 create mode 100644 git-2.40.0.tar.xz

diff --git a/completion-wordbreaks.diff b/completion-wordbreaks.diff
index d721f99..ee2d130 100644
--- a/completion-wordbreaks.diff
+++ b/completion-wordbreaks.diff
@@ -2,13 +2,13 @@
  contrib/completion/git-completion.bash |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: git-2.29.0/contrib/completion/git-completion.bash
+Index: git-2.40.0/contrib/completion/git-completion.bash
 ===================================================================
---- git-2.29.0.orig/contrib/completion/git-completion.bash
-+++ git-2.29.0/contrib/completion/git-completion.bash
-@@ -45,10 +45,12 @@
- #     When set to "1" suggest all options, including options which are
- #     typically hidden (e.g. '--allow-empty' for 'git commit').
+--- git-2.40.0.orig/contrib/completion/git-completion.bash
++++ git-2.40.0/contrib/completion/git-completion.bash
+@@ -65,10 +65,12 @@
+ #     case insensitively, even on systems with case sensitive file systems
+ #     (e.g., completing tag name "FOO" on "git checkout f<TAB>").
  
 -case "$COMP_WORDBREAKS" in
 -*:*) : great ;;
diff --git a/git-2.39.2.tar.sign b/git-2.39.2.tar.sign
deleted file mode 100644
index 1767fa7aead34793a9df5781596d1c3bc6ced5e5fc3da8607b8057dbd7937be3..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%PMyl>iC}5U{oA
zhL*49%Uk3R|5e~D+6HQa@Y#%!#z;;iO3aA@|6Bvs^Y;^WMcH~jg5Q&HVy8WtE#d5Z
z=vr9!Sw)7h1Q|)vRS^2GiQ^&xCp0hF6x6_57sx_Z&rIr#0NIF~FAje4#SG2AY>ndu
zSl@l=0`S05NezrwTkrFjjr941io>j#!l0EA29}^<u8_vAMFdsg<O!`Ag6Si-cf4IF
z3Tz2oBcxA94XLVaWQT<DKsTxK>6CQPS>TRMI>dL7+eO9(g%?#*s1~TCLCE~MS`N53
zd!D2(ihJ{6sx-xNGlC8(iLH?1#jR3RYSpxnpB<NaqPmeS4qYFbRW)(B;)e8^mx9hA
zqeu8xlV!1$lzq~<Y04R$<E)(MdEWBJr{CM-fy_ymZ@zi=iNyFa`!{yuG26(_{w_FX
zUN&xoJbHpUchB|G%qAF5RF!eIPn#wBIuyk75O(TzdCI<(Gn{Y$R$Y~K{PIQde0$Zh
zk_LY)G1%b2XK*b$@il38&u$E{aKTo3t?uKL;sNzkJXnhRoAQJ05*&zIM{0EmDut#N
zCN$uu{D<4rtosCbaB+MsAd%R+j<*Qw?0Jxtdbr9WU_yQ?+F$Fw^g026ZCaBnM+z^E
zICLV+z9f&O>-;$95EHoBIB|>Ju`8O<^Cs7aVz~8L{7XX~BbbJ{`w<ihLfpq@my4!3
El1Ba@{Qv*}

diff --git a/git-2.39.2.tar.xz b/git-2.39.2.tar.xz
deleted file mode 100644
index 2fb1a79..0000000
--- a/git-2.39.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6
-size 7163224
diff --git a/git-2.40.0.tar.sign b/git-2.40.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..3afdc6c2e7152de59feddf077605798863d65debca1d2eefd2197f32f1db1d8b
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%Q+b;s6Q>5U{oA
zhL*49%O1cG0FAcyLggB&S>j>xuY*&wC7h^alzZ_+O8U+Q;wsB5=~+<iOPWcDi$wAM
zw|$gWZ5M=9d7oE_cy|WDsqiYmtl+WgoB^XTS>U<vErYnBZx^wJ@jXw8K#U<7oJUBg
z))`*j5hN46RA!PMt{w$;jfv3Jygonul*VD-3}3%1&=9cS$i^UkPQ!(M$NY=oQ1<xb
z<&`u&@(+7fn1KeYJi_BR$z~J~YDWM6)b{90V4KZY>&Gf~l1bqEjP(uzLE1mhS(;W+
z;5xNntspE$fcm=H0}(^uK>JK(i#rlTrS;WPSv+t^&GHtm%mS5DdXk@gZ&DP~;pVqb
zQD{$)kexXC5d<_2dLIy-7%MUEMzc4f7*4lIlg|~;<}_uKA1H~kG!UBw`t{Fb8<#tD
z@QNRY?XZB!#8`>`uMQu!R4E!mKxrDMdC=R8w%`9Gj!YscSQ}1>=KU$=CmtHBgl5C%
zfW)ks6ub89XV>tm(&Gsxof8eZB$$476=XB6T22>mOzhyw%7mrqxgd#oD~?S0HoE#4
zBF>$U`F_1)GUZ8JsFN)81Hs({5Tkn4`R;vox?VCGH=884@)<weRkAJ3BmK1y!)o9D
z;MgVZw(sbr`Jm8meYCzI(JDtw*?;Oa4if$=uIY9mJ%mkq5jZLe|J5Ir7FBiENt&1_
ESkRFgcmMzZ

literal 0
HcmV?d00001

diff --git a/git-2.40.0.tar.xz b/git-2.40.0.tar.xz
new file mode 100644
index 0000000..682728b
--- /dev/null
+++ b/git-2.40.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d
+size 7183692
diff --git a/git.changes b/git.changes
index b0d6ce2..7b4b891 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Mar 13 20:08:03 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.40.0:
+  * backward incompatible change: The format.attach configuration
+    variable lacked a way to override a value defined in a
+    lower-priority configuration file (e.g. the system one) by
+    redefining it in a higher-priority configuration file. Now,
+    setting format.attach to an empty string means show the patch
+    inline in the e-mail message, without using MIME attachment.
+  * multiple commands and workflows gained additional options,
+    compatible functionality, or more helpful output
+  * "grep -P" learned to use Unicode Character Property to grok
+    character classes when processing \b and \w etc.
+  * under-the-hood improvements and bug fixes
+- The scripted "git add -p/-i" implementation was removed upstream.
+  The openSUSE package already preferred the C implementation.
+
 -------------------------------------------------------------------
 Tue Feb 14 20:06:06 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/git.spec b/git.spec
index 45e1d13..4531a5a 100644
--- a/git.spec
+++ b/git.spec
@@ -36,7 +36,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.39.2
+Version:        2.40.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -488,7 +488,6 @@ fi
 
 %files
 %dir %{_docdir}/%{name}
-%{gitexecdir}/git-add--interactive
 %{_docdir}/%{name}/README.md
 
 %files doc
@@ -571,8 +570,6 @@ fi
 %dir %{gitexecdir}
 %dir %{gitexecdir}/mergetools
 %{gitexecdir}/mergetools/guiffy
-# We want to prefer the builtin
-%exclude %{gitexecdir}/git-add--interactive
 %{_bindir}/git-new-workdir
 %{_datadir}/bash-completion/completions/*
 %{_sysconfdir}/bash_completion.d/git-prompt