commit d2864df6c02e05546aaf81d6976fcf38da1a868c
Author: Jan Palus <[email protected]>
Date: Fri Feb 3 02:36:59 2017 +0100
up to 2.11.1
- new patch to fix test t5615
- dropped "svn-exit-errors" patch -- over 3 years passed since it was
added, number of upstream fixes were made around git-svn and both
repos mentioned in
http://lists-archives.com/git/803126-git-svn-exits-with-error-error-closing-pipe-bad-file-descriptor.html
seem to work fine without the patch
git-core-svn-exit-errors.patch | 15 ---------------
git-core-t5615.patch | 11 +++++++++++
git-core.spec | 6 +++---
3 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index 9c6cb6d..afcd9eb 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,12 +14,12 @@
Summary: Distributed version control system focused on speed,
effectivity and usability
Summary(pl.UTF-8): Rozproszony system śledzenia treści skupiony na
szybkości, wydajności i użyteczności
Name: git-core
-Version: 2.11.0
+Version: 2.11.1
Release: 1
License: GPL v2
Group: Development/Tools
Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: dd4e3360e28aec5bb902fb34dd7fce3b
+# Source0-md5: 2970ae6cd234b2fca4f2d14ba4226f35
Source1: %{name}-gitweb.conf
Source2: %{name}-gitweb-httpd.conf
Source3: %{name}-gitweb-lighttpd.conf
@@ -31,7 +31,7 @@ Patch0: %{name}-tests.patch
Patch1: %{name}-key-bindings.patch
Patch2: %{name}-sysconfdir.patch
Patch3: cherry-picked-commitlog.patch
-Patch4: %{name}-svn-exit-errors.patch
+Patch4: %{name}-t5615.patch
URL: http://git-scm.com/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
diff --git a/git-core-svn-exit-errors.patch b/git-core-svn-exit-errors.patch
deleted file mode 100644
index d522644..0000000
--- a/git-core-svn-exit-errors.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/git-svn.perl b/git-svn.perl
-index d070de0..d93d133 100755
---- a/git-svn.perl
-+++ b/git-svn.perl
-@@ -2068,6 +2068,10 @@ sub gc_directory {
- }
- }
-
-+END {
-+ undef $_repository;
-+}
-+
- __END__
-
- Data structures:
diff --git a/git-core-t5615.patch b/git-core-t5615.patch
new file mode 100644
index 0000000..1637c65
--- /dev/null
+++ b/git-core-t5615.patch
@@ -0,0 +1,11 @@
+diff -urN git-2.11.1.orig/t/t5615-alternate-env.sh
git-2.11.1/t/t5615-alternate-env.sh
+--- git-2.11.1.orig/t/t5615-alternate-env.sh 2017-02-03 02:24:45.115143042
+0100
++++ git-2.11.1/t/t5615-alternate-env.sh 2017-02-03 02:24:58.081809318
+0100
+@@ -77,6 +77,7 @@
+ check_obj "$quoted:$unquoted" <<-EOF
+ $one blob
+ $two blob
++ EOF
+ '
+
+ test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/d2864df6c02e05546aaf81d6976fcf38da1a868c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
