From eabb31532abafbe3c4e75a09586dce882688408b4f171740022f7208adbc7584 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 23 Oct 2020 10:19:41 +0000
Subject: [PATCH] Accepting request 842637 from devel:tools:scm

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

diff --git a/completion-wordbreaks.diff b/completion-wordbreaks.diff
index 1dd5a18..d721f99 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.23.0/contrib/completion/git-completion.bash
+Index: git-2.29.0/contrib/completion/git-completion.bash
 ===================================================================
---- 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).
+--- 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').
  
 -case "$COMP_WORDBREAKS" in
 -*:*) : great ;;
diff --git a/git-2.28.0.tar.sign b/git-2.28.0.tar.sign
deleted file mode 100644
index 23a9bb8e47477ac27da187f8aa7e728e77f68c8a2d71657e4918a77b01ee2f89..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$(01z5ogd5U{oA
zhL*49%a)`N0H%)%m4(KHtsd-J5#I=U)kn}8#dQZXVGj;x!O#QrE-((fXdQnI5z27;
z3VphoRHJ_$&g7z1(a8Z0Ry%-Xy)|IwAP47bU7mjC@E<QZYm4D^bwdLIbsk*O%Ka2B
z=k+=t)t{MjE=`7&<c>Fn@PFv>Yen#+Ab-sz?b4@Ce{NamFv9kDU-F+y{h5@3wx*QO
zgV0@N7a&}M?wFU%f^f)jSD*(=e#FJsD0#B`8BXqZLLo-`lqE2wZG7?bdU&V(acXp`
z6gO`%y<C9<pNV0$m2_=#4Y<}tgpVJGz`3yt7dAZ1&0qD4G5{ZD<MUKrZ6%l=EB*);
z4XB@H!F2F8;`k-EVqI~ZD9`L!?O4X@cEmB$PkB9PTmY?;S|bX5>5C0!&kmpC6uZ&#
zkS`aLJj|9hNM0jJN6a@g*F=M6AoMT0S2u*i0EXpUt11{E=^3%c%Zq3m@%V3aM4j6=
zL=y)E03STjZ9cu`7q<yDIxNrdvXkzGe-4&rczWAiLGbO8rIn>1U*Vg=0Fu1uJ&ej2
zo;0%w<mw`j!oOA|+lQ7$1{jjH4y)u{&g*!^mpppMc8&BcK28lW=RcV<osGndbTjyj
zFl?UrP0Pq6mSLdmi@;K`G)w!DnUi@*JYbzy!WUCMor<iYD~+uEL;w`?*5m;|fMq$t
E89A;H>i_@%

diff --git a/git-2.28.0.tar.xz b/git-2.28.0.tar.xz
deleted file mode 100644
index 582823b..0000000
--- a/git-2.28.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d
-size 6117608
diff --git a/git-2.29.0.tar.sign b/git-2.29.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..68e4a0488b33916354547a7dc72ee09d18200135a54f53339c4fb6b5e04c70d6
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$+{Jh5!l)5U{oA
zhL*49%f^@w|6Pw5nEMxffR99QrvLWA+~V4BA@Qar`b>Ywa`LY)m7=_f1G;Ec0jBTb
zj)t&o!kBLlj3&Z1je-254~d6`q}qW(Juf{4v4bX^n0Xmj<O@%^J|zS@oLqe7gfoi$
zQGmB{&FMeBjunYHD(BvMO;f){uaa((5NDfb8zAod9p$oRjGVt8NWdtO0f?&hnN=Wo
zNLSEamEwEALM4-0W;b||D}xy~nn)|SPA|^s!jrlSX&;_XcHDl-{b03jI@!BrkcWH%
zv-5Qnq%<4j>?jleNYVpuzsx>0UjGMpZ+nPvtGw=^TIYYcsY!_4X5Q#JB`*Z(+F$dN
zDm}XTG}||yx#UHtI1B`2f1P{2M(LVDy@t)BeQ|)n|5D}GNsZy*3%~72aD?j*gkQkA
z-(W0OxFmynpv)Vxw_{bQ;zbZ8J`f@K`y*JOdHo`iYAh<fCyYT7|B@W$9wnQ>D=G2}
zZ-p2?4KWAIoSdbN)K$7LwA$9Ipii5{a)ez=pcI1W?I*o*(;P@o&JN%a?2jec^)Zb5
zllg^rD$5Ya9S|{d7zMCScBaXIP#?l5J&7ig(#d$~1jA7@+eOkLOsc-tL2amUjf#0$
z@wqdmE`aJ`MW;EgeCS>LEt#zZYtIU9Xick~&|P7^S9rVdk&QUma^K}|p(QE&6EV*l
EJE))-=>Px#

literal 0
HcmV?d00001

diff --git a/git-2.29.0.tar.xz b/git-2.29.0.tar.xz
new file mode 100644
index 0000000..ebadd0e
--- /dev/null
+++ b/git-2.29.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28432d995257c4626fe0fb2091f588df6eed98e9571419e72c83bc23372e6b89
+size 6187748
diff --git a/git.changes b/git.changes
index 1f1bb18..0ce596d 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 19 20:12:45 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.29.0:
+  * The transport protocol v2 has become the default again
+  * "git worktree" gained a "repair" subcommand, "git init
+    --separate-git-dir" no longer corrupts administrative data
+    related to linked worktrees
+  * "git maintenance" introduced for repository maintenance tasks
+  * enhancements to multiple workflows, addition of configuration
+    options and supported parameters, and bug fixes
+
 -------------------------------------------------------------------
 Tue Jul 28 10:08:47 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/git.spec b/git.spec
index 9f19487..1831043 100644
--- a/git.spec
+++ b/git.spec
@@ -36,7 +36,7 @@
 %endif
 
 Name:           git
-Version:        2.28.0
+Version:        2.29.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only