From 0a76183baf38e712280025a17add8958586644c51de7f0426c7cfd856aa1d310 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sun, 26 Feb 2017 16:05:23 +0000
Subject: [PATCH] Accepting request 460315 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/460315
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=194
---
 git-2.11.1.tar.sign | Bin 543 -> 0 bytes
 git-2.11.1.tar.xz   |   3 ---
 git-2.12.0.tar.sign | Bin 0 -> 543 bytes
 git-2.12.0.tar.xz   |   3 +++
 git.changes         |  15 +++++++++++++++
 git.spec            |   2 +-
 6 files changed, 19 insertions(+), 4 deletions(-)
 delete mode 100644 git-2.11.1.tar.sign
 delete mode 100644 git-2.11.1.tar.xz
 create mode 100644 git-2.12.0.tar.sign
 create mode 100644 git-2.12.0.tar.xz

diff --git a/git-2.11.1.tar.sign b/git-2.11.1.tar.sign
deleted file mode 100644
index 1229d0216c96ed662834a608a955fa45b260500438e57154adfe636b96a2ad93..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-);s{jBB2@tTg=!TZB=F2Ta5CGHhK_!~6J(kF6Oy&LZ
z(nn8&UoQ!J_h{B@+sk7%ykjLZcs1x*oQ7#aN(oPFJAT)EM9M*vnTkH8SW@Zz_Kaq2
z9T>D+v-cnD^fc=(DR~Sj^b^v1jcwe5oU|iUsn@5=P{uQ+x?CsvIs8XLwZ~<P7_=|J
zE%tSK-8hb~@@mF6&jm+UpW$s|b)$g7?xsD=0F^-~Y@=06(WrLE8~dJ@zRQ*Hu<zY3
z4<uMn5FFG<We2zoMejezBjYNoz}b)}Pt0cu%Z#fi9{|_0&7~;sbzA!`-q%4@Ky^{w
zP)>=kzY;}&A!^{JES(3INSgsa^{<2&vw6mM&;%EK^f$ZDdmpC1)s2v7HxRgxjf2Jf
zJq5~)kz6^inNL*eS`u;!<*1@p{RFfH+8Btw(#+EBl4dba<YQp)M~L_D7wn~89w<xs
zpu9P*3=7E4tLU6%7`#XXod(ULrJ0{1Cq@m$l2TrG(N&4SX=J9GK*}ghVrA7m)m;QM
z9&PS-8Ji!|J(pDP60AZ9?>o<8UP#}$s1fAkXrinSYCrwj*Ow6G|0>n(NH_u^#&APa
z?1hFQQ}!LOt$Zs(=ksY*gYF8l^%)Zii2<~9Z_Z+{H@)^y5w61bRl=C5Tnira<R5`F
hl$I7NVwZ>8yv`!byezlzczM4IlBbajaDE1KPR-aM2tNP-

diff --git a/git-2.11.1.tar.xz b/git-2.11.1.tar.xz
deleted file mode 100644
index 6607692..0000000
--- a/git-2.11.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415
-size 4208132
diff --git a/git-2.12.0.tar.sign b/git-2.12.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..e2fa4e70320a0f8b319d1b8c10ff2f30128bc523e66daf2319dd3fd3f9dcbe9a
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-*Gh;sl62@tTg=!TZB=F1j65B?#GfT{V}0>TO53^Fe!
zw5@M5jThL<gdAwr0@5g0QLE%qZQw4b%v!gK;uxO6w4LRS2&G_=qdqMk+DI@|g-Ncv
zV#!UA3L_P`VXlV7b(0PZM_R_gl(vk<|0T6Lcber6YHB-AW2$F*-ry83YMsj%I#)Jo
zVi|BjfEkpH#^vF_lN-;MIK4x9-w=pzol_-e^7J4URWgQPsw@B`eHXT5=q|lTmmZ%z
zDsDc?j0<6sD-|~^gp{69guJSoY2n@^u!UJ6@#l_bxy?94)v<w3|KX9mFUaNYQLZS(
zMbzqsm`)*E6~0cbiCEbjN?TDV6FIm_$noE7y4!Qp5%HF|sQpC5ihK4EKYG1>q1OmO
zz5nJ@BJSN;30=^4k4HQx`TrndZr3Ac75GElyzVkDMZ5V-(nSNgLg8>_E}#VPdlW`;
zV66i04bH(TML|==^%CGy0+{Rp#H+B@KN^A-N4irT($kTXlbg^ca-0G_h`||pL$1D9
zk_i8Ny)`f#-#vOioaZY4{qW>{f*1*3H>=Q;VCft}tLZuUNDJ|=>LV0ko{0<lYg*)l
zz;{uC?+T5`3wl#+=)N;|okDFXfk$1LPqe#JY$hZ>3U$oVEoZA*8$Wx042Gm4r+hqH
hzuhXj*Nn665P5hYsU;h%pj6VbffyvOF7u78q{9KT0tNs8

literal 0
HcmV?d00001

diff --git a/git-2.12.0.tar.xz b/git-2.12.0.tar.xz
new file mode 100644
index 0000000..f3fc443
--- /dev/null
+++ b/git-2.12.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027
+size 4269944
diff --git a/git.changes b/git.changes
index d61374b..e35b55d 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Feb 24 22:07:09 UTC 2017 - astieger@suse.com
+
+- git 2.12.0:
+  * Use of an empty string that is used for 'everything matches' is
+    still warned and Git asks users to use a more explicit '.' for that
+    instead.  The hope is that existing users will not mind this
+    change, and eventually the warning can be turned into a hard error,
+    upgrading the deprecation into removal of this (mis)feature.  That
+    is not scheduled to happen in the upcoming release (yet).
+  * The historical argument order "git merge <msg> HEAD <commit>..."
+    has been deprecated for quite some time, and will be removed in a
+    future release.
+  * An ancient script "git relink" has been removed.
+
 -------------------------------------------------------------------
 Thu Feb  9 19:12:11 UTC 2017 - dimstar@opensuse.org
 
diff --git a/git.spec b/git.spec
index 0b63934..408a318 100644
--- a/git.spec
+++ b/git.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           git
-Version:        2.11.1
+Version:        2.12.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0