From 64c6816a53572afdac304a7c2a7e10afb5d577650b3cf4b0b88eb4792438e596 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 27 Aug 2019 13:19:57 +0000
Subject: [PATCH] Accepting request 724398 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/724398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=237
---
 completion-wordbreaks.diff |  12 ++++++------
 git-2.22.1.tar.sign        | Bin 566 -> 0 bytes
 git-2.22.1.tar.xz          |   3 ---
 git-2.23.0.tar.sign        | Bin 0 -> 566 bytes
 git-2.23.0.tar.xz          |   3 +++
 git.changes                |  12 ++++++++++++
 git.spec                   |   2 +-
 7 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 git-2.22.1.tar.sign
 delete mode 100644 git-2.22.1.tar.xz
 create mode 100644 git-2.23.0.tar.sign
 create mode 100644 git-2.23.0.tar.xz

diff --git a/completion-wordbreaks.diff b/completion-wordbreaks.diff
index 0b750a2..1dd5a18 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.13.0/contrib/completion/git-completion.bash
+Index: git-2.23.0/contrib/completion/git-completion.bash
 ===================================================================
---- git-2.13.0.orig/contrib/completion/git-completion.bash	2017-05-09 16:47:28.000000000 +0200
-+++ git-2.13.0/contrib/completion/git-completion.bash	2017-05-10 12:09:05.594109083 +0200
-@@ -37,10 +37,12 @@
- #     When set to "1", do not include "DWIM" suggestions in git-checkout
- #     completion (e.g., completing "foo" when "origin/foo" exists).
+--- git-2.23.0.orig/contrib/completion/git-completion.bash
++++ git-2.23.0/contrib/completion/git-completion.bash
+@@ -40,10 +40,12 @@
+ #     and git-switch completion (e.g., completing "foo" when "origin/foo"
+ #     exists).
  
 -case "$COMP_WORDBREAKS" in
 -*:*) : great ;;
diff --git a/git-2.22.1.tar.sign b/git-2.22.1.tar.sign
deleted file mode 100644
index ed120fcd5b9f662ca7dd5c0345e9e8cdb726a60d551a339101ecda1c5c03bb67..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$ow1NB{~65U{oA
zhL*49%cNfr0F|N%baaUp&K>N$Smon1qS(Xq{*H4sc4aSVu{30TQKxd1?ztl;{7=Mo
z)*)XIeAm-FP_AA7w5kA9&r-||&Qv>;G>BQ<(Nk@j3w#R<@K3PraA-!GaUo5;$UhJ)
z*k#zp?|wAMhpDi~_Z_SPa^yTiEuL+^3mB}`$jeJSVMedkV(N0p(A^v8bGjV2C==}i
zgaVjnrMP4jW3uG#9jUSu0KOgCtf*em<s4(y0VEGuWaO`698&t|!w3GT$@n6#Rx=P)
zg$+PmJWF%to}^c^AOp9(#BF)+3+n7o=G<j+;wj1%p{X9CCjML>zp9~|&pXe&+@4sz
zGm$$b7hUh=@cm}ck&YN91YzXwQArGcD}zj6ZxTDbD!DuX`<v&c)mcvZi4?0HSPnMK
z<R0QXg4)tuOj_ef^?&!x05?akTWMDQ6L8^o8G@IeETeFeuc-(4>!PFZ??S>J=IMYN
zA(D{_I(TbJsob<e`VQJ$qL&w*yr>Z;(S5%UGR#fNB8R1qi$@XD5j&ukcZ{Y@N(mR2
zrhJB&`OOn5p=*(pG5`<U>08?<=x*jU=_fiEu2EgMhuztW32*drWCoO%p+kIxxG;*^
z&)btDn%BBmKb8FD@+&VBbVT;xJsF7VXLZv=df1A)k-Q>f$<OTxd5RR(g{x=P5vMP&
Ef*n*DF#rGn

diff --git a/git-2.22.1.tar.xz b/git-2.22.1.tar.xz
deleted file mode 100644
index f34e27e..0000000
--- a/git-2.22.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ce1f93ab77847e9a9d565ee7c94ceadb80ea7d477fe68123f2329f8d4937824
-size 5616124
diff --git a/git-2.23.0.tar.sign b/git-2.23.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..45eb08131db3845e387131fcac1fc67254c4db99ebd15cd90c098381063b7138
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$o=O+yDv*5U{oA
zhL*49%bBAP0Pw{rFZF?r>d8{JTS6B4-lz6xt5{Db3;gyAYN<&@i6Q;UtDiYs{!Fj_
zzdTw%>I8Pc^yJceL`%kUk7eoTJ!-s0`{7MA5dt0t^kaIbp?$8fQevr6$2dC}j#y$n
z<+X$O`JMX3FlV^xG}5u{^Okx>Q+N(($ArNIIrb)74@vH}H?oxC<xD*Z##*>?KS18*
z4gqxE+5XnG5Ltg9s-|}04xrWrLf_BvB1algZ@9<7n0*vGlY9xO(i)jh;4vBcBE&Zx
zh)*AaY^Z=KyLbs?&gKrRk5E!schiQ_-EKo+k9-tu+Tw7uUW0bm<>)+(WW1hhQ<jCH
zSr!>DIhyYtGxJhkj4P1;1qtjw^prxazIHU_20jS9u<Feugng?7i&><*K;I1oy`KSY
z1u0lc8er*@lJZeC0noMtY6}Ztq`#`5hMU%}tO}}k3JkN^qGF-%uRRq0Nr1v3QMc6a
zOxPs7DXtcR90<`jF>GjvFT38$$>m?XnD+3L6e~QikoWwCWH@wyDcy{|Pb@-?hh$Dp
zH1V7r6NC$R^~03neKd*lo?dui+C|~f((Nn8HQEDOGvxhE^J<NVDb^z8FpzOnr2`3U
zB-dDD3K|9XEvSxo-)07hEVJ0nrjaotBfv<Wr#xw$#3x>77C^%bpU6LS<X`JT`3-pq
EN>+>%@Bjb+

literal 0
HcmV?d00001

diff --git a/git-2.23.0.tar.xz b/git-2.23.0.tar.xz
new file mode 100644
index 0000000..2898006
--- /dev/null
+++ b/git-2.23.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:234fa05b6839e92dc300b2dd78c92ec9c0c8d439f65e1d430a7034f60af16067
+size 5707148
diff --git a/git.changes b/git.changes
index 2d09d2b..644cdad 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Aug 18 15:24:45 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.23.0:
+  * The "--base" option of "format-patch" computed the patch-ids for
+    prerequisite patches in an unstable way, which has been updated
+    to compute in a way that is compatible with "git patch-id
+    --stable".
+  * The "git log" command by default behaves as if the --mailmap
+    option was given.
+  * fixes and improvements to UI, workflow and features
+
 -------------------------------------------------------------------
 Wed Aug 14 11:21:43 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/git.spec b/git.spec
index 392d49f..a1d0043 100644
--- a/git.spec
+++ b/git.spec
@@ -29,7 +29,7 @@
 %bcond_without git_libsecret
 %bcond_without docs
 Name:           git
-Version:        2.22.1
+Version:        2.23.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only