From d368575d01731c9c324b4942e31f395687c51254af4e156e19b5179a9e58261e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 16 Aug 2019 13:32:42 +0000
Subject: [PATCH] Accepting request 723284 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/723284
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=236
---
 git-2.22.0.tar.sign | Bin 566 -> 0 bytes
 git-2.22.0.tar.xz   |   3 ---
 git-2.22.1.tar.sign | Bin 0 -> 566 bytes
 git-2.22.1.tar.xz   |   3 +++
 git.changes         |  32 ++++++++++++++++++++++++++++++++
 git.spec            |   4 ++--
 6 files changed, 37 insertions(+), 5 deletions(-)
 delete mode 100644 git-2.22.0.tar.sign
 delete mode 100644 git-2.22.0.tar.xz
 create mode 100644 git-2.22.1.tar.sign
 create mode 100644 git-2.22.1.tar.xz

diff --git a/git-2.22.0.tar.sign b/git-2.22.0.tar.sign
deleted file mode 100644
index 15548ba7cec693dcc5be86d4bea5a60e2a2980b8cbd950499bfcc3515a59795d..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$lpDuK)@O5U{oA
zhL*49%fT8C{SplsU>bwKmgER|;TLxi4)33NXD>5)n6kRJNRP6*?+|kwPli8TKMyH*
zb7k#ngY2&p{LmO{v+!=d7Rd}Wh@1gOGn5LUXoQ=R+_F&Ry8$4AHlY(H-KJCCxfOf6
zO0s2%3Yi$Sx*8h|N6dxj&Bq?sld%zDid?`45ah^OD)-nOBrq;Z(JT%TCCHZ^$YE;9
zT6cL)!qv%$;1ezQ)#cn(;8e7sptdRoDY=ZfI@6)o(>BY07J~p!R(PrhyHLbdr!{Hp
zlLQpr30!gK?&vlkw3dgJl`xYzP4SV9KD@9&uq$3fSil`OY}Y~K0u}k$&EJi)ocQSj
zPH{?1ieHQJv$dr|R>p1+21l7?E}dFha&+$s)oBY^_pwadhSD|kdr63vJH9=Ygiv9R
zk32GGm;O)N;C}9W%mje9Cf0%UztuH6rpc2E(l;!u*}K4(OGiKXtri9@jsVb7Qc>*G
zu`Y(d3gBAnHWIpAC^VX<N+#9eJ#Y&1nBur$R5(gy*P2(KY}i6~S>I#6>QOJ4dRh;X
zUE`#+)KN%Oz80z$C`*AAXb>dyS@qlY1vM3xJCw6*x0l?*jM@ALXqW-OAqAu_m-_<I
zrK+0iH1t%sL_5=0tiP(IpEy5lN$sl%uX*i}nHxbd60zF)tyV5%maZkHdMO=~A8F?S
E$NJq7Y5)KL

diff --git a/git-2.22.0.tar.xz b/git-2.22.0.tar.xz
deleted file mode 100644
index 2fdb386..0000000
--- a/git-2.22.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
-size 5609772
diff --git a/git-2.22.1.tar.sign b/git-2.22.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..ed120fcd5b9f662ca7dd5c0345e9e8cdb726a60d551a339101ecda1c5c03bb67
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/git-2.22.1.tar.xz b/git-2.22.1.tar.xz
new file mode 100644
index 0000000..f34e27e
--- /dev/null
+++ b/git-2.22.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ce1f93ab77847e9a9d565ee7c94ceadb80ea7d477fe68123f2329f8d4937824
+size 5616124
diff --git a/git.changes b/git.changes
index 21cd9e5..2d09d2b 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Wed Aug 14 11:21:43 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+
+- git 2.22.1
+  * A relative pathname given to "git init --template=<path> <repo>"
+  ought to be relative to the directory "git init" gets invoked in,
+  but it instead was made relative to the repository, which has been
+  corrected.
+  * "git worktree add" used to fail when another worktree connected to
+  the same repository was corrupt, which has been corrected.
+  * "git am -i --resolved" segfaulted after trying to see a commit as
+  if it were a tree, which has been corrected.
+  * "git merge --squash" is designed to update the working tree and the
+  index without creating the commit, and this cannot be countermanded
+  by adding the "--commit" option; the command now refuses to work
+  when both options are given.
+  * Update to Unicode 12.1 width table.
+  * "git request-pull" learned to warn when the ref we ask them to pull
+  from in the local repository and in the published repository are
+  different.
+  * "git fetch" into a lazy clone forgot to fetch base objects that are
+  necessary to complete delta in a thin packfile, which has been
+  corrected.
+  * The URL decoding code has been updated to avoid going past the end
+  of the string while parsing %-<hex>-<hex> sequence.
+  * "git clean" silently skipped a path when it cannot lstat() it; now
+  it gives a warning.
+  * "git rm" to resolve a conflicted path leaked an internal message
+  "needs merge" before actually removing the path, which was
+  confusing. This has been corrected.
+  * Many more bugfixes and code cleanups.
+
 -------------------------------------------------------------------
 Wed Jul 24 09:17:31 UTC 2019 - matthias.gerstner@suse.com
 
diff --git a/git.spec b/git.spec
index 3522d51..392d49f 100644
--- a/git.spec
+++ b/git.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -29,7 +29,7 @@
 %bcond_without git_libsecret
 %bcond_without docs
 Name:           git
-Version:        2.22.0
+Version:        2.22.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only