From 546eaed68e1d5bf7518e95e3935b29da2f941d885f92356927d88e7d58d5cec2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 16 Oct 2021 20:46:53 +0000
Subject: [PATCH] Accepting request 925231 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/925231
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=268
---
 git-2.33.0.tar.sign | Bin 566 -> 0 bytes
 git-2.33.0.tar.xz   |   3 ---
 git-2.33.1.tar.sign | Bin 0 -> 566 bytes
 git-2.33.1.tar.xz   |   3 +++
 git.changes         |  14 ++++++++++++++
 git.spec            |   2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 100644 git-2.33.0.tar.sign
 delete mode 100644 git-2.33.0.tar.xz
 create mode 100644 git-2.33.1.tar.sign
 create mode 100644 git-2.33.1.tar.xz

diff --git a/git-2.33.0.tar.sign b/git-2.33.0.tar.sign
deleted file mode 100644
index 78ebdf8b5af81bfdb9b6a3d867e741e5a241a0ea9be7bfb3663237fe35fd6c0f..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%026H~<O>5U{oA
zhL*49%grGV|4OD&ZeDkE3Ne0d<0$#jNZ8>)KUtIki#Y*<r0i=YU|6_p0Vy2H-$7>5
zKZ-4{#l!95yMC@kNH{As53*?IE4{dnONtATwSX*C@va-$lp4LE*6gcRyO7LDVj37H
zd+CQwhPFRYd)G1PiWe#u;APvMYq{9x#JBDuK?zh7i|s4Eo5MtsYXjOSY$PlnsjW*%
zr9b+!$ska#(LYpwa)a~fAD8X?Kdmoz!!NsaA$l?vLiFeuADNWf`UPfp67HM_h(H3J
zH!DIO`GGM^0POWp&D2Jkw1dD2t_Doss1!9cIjqb{+a)SN<vhdT#Z_reFotW6t^?gn
zK{MweSyIhF!v4^WX6_rv@%SZh&gYfKZb!yw7Mzp)RLP@vjV5(3sws0O?OmUSj2}_W
z`Ctun!Q?5Hh{jeg4lzhPat686NJEqm@W48x4M0B-Pt+6@tpHM|(P<j!=}9~0--Yfh
zEjR4GCJ6+g1%HY`i+*&&0P8x3%r%gnzf}LkUo%nv`Bk(}X9ZL>i(<qI-ww{lr_nAo
z2x#$=-gC&WK6j>6rM5(yCPwPhUrB@c&fc(KO|ZiF6Zwdx^cGeS76tz;sRY;dIVXo|
z=|kai{gx}#-ERYcHuN+V^%Ngbb9o^vP@^nft+1(iX6zrOx*xw%x<;^c)%+)AkSsY5
EJd_y@+W-In

diff --git a/git-2.33.0.tar.xz b/git-2.33.0.tar.xz
deleted file mode 100644
index 6dcd5d9..0000000
--- a/git-2.33.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
-size 6548308
diff --git a/git-2.33.1.tar.sign b/git-2.33.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..250d252701d46127fd7fce6ccfbed59944d684a0b76c53b04559b8dc98673011
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%2wTxc~|Y5U{oA
zhL*49%fO@${w?cP0#;FTq_&~W+sI{<pXzle(JbF3q6ATTRs3yA6xRm&b-{YjewNMt
zhxaCFxF8J+d<>%3n5_}GzP=jm+6fjyf#z(Bp=?xKa#_QWTj_*=HXLnmz5N0@)}jkB
zlrg2O<qfC2I8^^F{TiIDI_WQs&So@^$i;}gR&9~Oh)><ok$qv1XHdUAF+_U?A&is&
z{46lrj+l6uF_(5x)0Tw`KQIsXA7Fz^31~plbqC%qkRC+su)&W8lnZFCGKZT@Pqj7U
z(x-Jrs6P@3m=44%zf<!@cN_#mNMLod#YvoGqO!HNCarjol(`4BJu0AK#kec4f#uky
zvA&xBVZ@unQaCTVlrNjd($#+50Qc6UY#vqNQKq}XSN82xa@=I6`3nP%8Feqw;4;3p
zYH@tR>6?N~;cRG0=I72WSmW^<5SZA@s#VsIp@~!1H^df!!hMoGNh&lG!tSHP0A~=A
z_0`p~9M3g)FW|G8Xb4CP1$zZI9-~_?C3sP*a&re1s$YGLOW46pz%02@WM4y(sAfpu
zptbXdW5kZyZHa-apyPiEkLnhvDk(eVTLqcBAg;Q_(@Vu6M6v3SPsy|QiGUM#Gd0La
zqkYm4`2?ih_L4s`Nk3bZ$mVz<t1l-*-D#n`+TGb+!n{`+rrX}R#r-O7(`IxV&nM+j
Epo$L~9RL6T

literal 0
HcmV?d00001

diff --git a/git-2.33.1.tar.xz b/git-2.33.1.tar.xz
new file mode 100644
index 0000000..04267c9
--- /dev/null
+++ b/git-2.33.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
+size 6558636
diff --git a/git.changes b/git.changes
index 0c0cde5..f1158df 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct 13 18:09:43 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.33.1:
+  * fix "git pull" and "git rebase -r" various corner cases and bugs
+  * "git commit --fixup" now works with "--edit" again.
+  * Fix "git send-email" unwanted threading
+  * Fix output from "git fast-export" anonymization feature
+    showing an annotated tag incorrectly.
+  * Fixes for various command output
+  * fix "git difftool --dir-diff" mishandling symbolic links
+  * Redact sensitive data in the HTTP trace for HTTP/2 requests
+  * further bug fixes for various git operations
+
 -------------------------------------------------------------------
 Mon Sep 20 08:33:11 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/git.spec b/git.spec
index 6e095d4..f5e6961 100644
--- a/git.spec
+++ b/git.spec
@@ -36,7 +36,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.33.0
+Version:        2.33.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only