Accepting request 764323 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/764323
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=243

git-2.24.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562
-size 5772304

git-2.25.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
+size 5873532

git-skip-test-s390x-aarch64-fail.patch

@@ -1,16 +0,0 @@
-Index: git-2.24.0/t/t7812-grep-icase-non-ascii.sh
-===================================================================
---- git-2.24.0.orig/t/t7812-grep-icase-non-ascii.sh
-+++ git-2.24.0/t/t7812-grep-icase-non-ascii.sh
-@@ -74,11 +74,4 @@ test_expect_success GETTEXT_LOCALE,LIBPC
- 	test_cmp expected actual
- '
- 
--test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
--	test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
--	test_cmp expected actual &&
--	test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 &&
--	test_cmp expected actual
--'
--
- test_done

git.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jan 14 14:22:10 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- git 2.25.0
+  * The branch description ("git branch --edit-description") has been
+    used to fill the body of the cover letters by the format-patch
+    command; this has been enhanced so that the subject can also be
+    filled.
+  * A few commands learned to take the pathspec from the standard input
+    or a named file, instead of taking it as the command line
+    arguments, with the "--pathspec-from-file" option.
+  * Test updates to prepare for SHA-2 transition continues.
+  * Redo "git name-rev" to avoid recursive calls.
+  * When all files from some subdirectory were renamed to the root
+    directory, the directory rename heuristics would fail to detect that
+    as a rename/merge of the subdirectory to the root directory, which has
+    been corrected.
+  * HTTP transport had possible allocator/deallocator mismatch, which
+    has been corrected.
+ - dropped patch git-skip-test-s390x-aarch64-fail.patch (bsc#1156651)
+   * upstream maintainers have skipped the test themselves
+
 -------------------------------------------------------------------
 Wed Dec 11 06:37:34 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 

git.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package git
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@
 %endif
 
 Name:           git
-Version:        2.24.1
+Version:        2.25.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -57,8 +57,6 @@ Patch7:         git-zsh-completion-fixes.diff
 Patch8:         git-asciidoc.patch
 Patch10:        setup-don-t-fail-if-commondir-reference-is-deleted.patch
 Patch11:        0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch
-# workaround for bsc#1156651, try to build without it when updating
-Patch12:        git-skip-test-s390x-aarch64-fail.patch
 Patch13:        0002-Also-use-DocBook-5-stylesheet-when-generating-HTML-o.patch
 BuildRequires:  fdupes
 BuildRequires:  gpg2
@@ -287,7 +285,6 @@ directory /git/ that calls the cgi script.
 %patch8 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 
 %build