Accepting request 1071417 from devel:tools:scm

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

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 ;;

git-2.39.2.tar.xz

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

git-2.40.0.tar.xz

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

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>
 

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