From e1b6d39de6d8dba7d36ce5d4b21524e0cda2a8f0 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 1 Apr 2021 00:55:15 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/git.git#be5cd56333bf65be15f7f22ab152b8c2e39336cc
---
 git.skip-test-patterns |  1 +
 git.spec               | 11 ++++++++++-
 sources                |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/git.skip-test-patterns b/git.skip-test-patterns
index f80cadf..28a66b8 100644
--- a/git.skip-test-patterns
+++ b/git.skip-test-patterns
@@ -13,6 +13,7 @@ missing !PCRE
 missing !PTHREADS
 missing RFC1991
 missing TAR_NEEDS_PAX_FALLBACK
+missing UTF8_NFD_TO_NFC
 skipping case insensitive tests
 skipping git p4 tests
 skipping remote-svn tests, python not available
diff --git a/git.spec b/git.spec
index caf8df8..5de1293 100644
--- a/git.spec
+++ b/git.spec
@@ -96,7 +96,7 @@
 #global rcrev   .rc0
 
 Name:           git
-Version:        2.30.2
+Version:        2.31.1
 Release:        1%{?rcrev}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -1070,6 +1070,15 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Sat Mar 27 2021 Todd Zullinger <tmz@pobox.com> - 2.31.1-1
+- update to 2.31.1
+
+* Fri Mar 19 2021 Todd Zullinger <tmz@pobox.com> - 2.31.0-2
+- fix git bisect with annotaged tags
+
+* Mon Mar 15 2021 Todd Zullinger <tmz@pobox.com> - 2.31.0-1
+- update to 2.31.0
+
 * Tue Mar 09 2021 Todd Zullinger <tmz@pobox.com> - 2.30.2-1
 - update to 2.30.2 (CVE-2021-21300)
 
diff --git a/sources b/sources
index de8021b..c9311bd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.30.2.tar.xz) = 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
-SHA512 (git-2.30.2.tar.sign) = 36aed3ddda7d60899970c63da7afd5e64a27d1a0998aaeabfcdb8f3865b5629f8b9b039cd3b23532d358b995bd700dfbe0624c48568ac102763498a1fc409b0c
+SHA512 (git-2.31.1.tar.xz) = 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
+SHA512 (git-2.31.1.tar.sign) = 0a721876f9869d1dc9a43e7f83f8e63a3d8fa932ff2d2e69bb98f3e314e2e9a896c2171cb6a020d6c6e929fdf1af736dbeb3f25f93fb4d359a9aaa5b859069c3