From: Kacper Kornet <draenog@pld-linux.org>
Date: Fri, 20 May 2011 12:41:52 +0000 (+0000)
Subject: - up to 1.7.5.2
X-Git-Tag: auto/th/git-core-1_7_5_2-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=commitdiff_plain;h=1b2c5285b6e2d1059346326d6e2d2ce733d014ab

- up to 1.7.5.2
- remove patches for issues fixed upstream

Changed files:
    git-core-tests.patch -> 1.5
    git-core.spec -> 1.244
---

diff --git a/git-core-tests.patch b/git-core-tests.patch
index 473e519..0bbfc3d 100644
--- a/git-core-tests.patch
+++ b/git-core-tests.patch
@@ -11,32 +11,3 @@ diff -ur git-1.7.0.3.orig/t/t1304-default-acl.sh git-1.7.0.3/t/t1304-default-acl
  
  # We need an arbitrary other user give permission to using ACLs. root
 
---- git-1.7.3.2/t/t3701-add-interactive.sh.orig	2010-10-22 05:49:16.000000000 +0200
-+++ git-1.7.3.2/t/t3701-add-interactive.sh	2010-11-18 22:36:35.271101613 +0100
-@@ -83,9 +83,9 @@
- 
- test_expect_success PERL 'setup fake editor' '
- 	cat >fake_editor.sh <<EOF
--	EOF
-+EOF
- 	chmod a+x fake_editor.sh &&
--	test_set_editor "$(pwd)/fake_editor.sh" &&
-+	test_set_editor "$(pwd)/fake_editor.sh"
- '
- 
- test_expect_success PERL 'dummy edit works' '
-diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
-index 4a6396f..bad09f9 100755
---- a/t/t1506-rev-parse-diagnosis.sh
-+++ b/t/t1506-rev-parse-diagnosis.sh
-@@ -8,8 +8,8 @@ exec </dev/null
- 
- test_did_you_mean ()
- {
--	printf "fatal: Path '$2$3' $4, but not ${5:-'$3'}.\n" >expected &&
--	printf "Did you mean '$1:$2$3'${2:+ aka '$1:./$3'}?\n" >>expected &&
-+	printf "fatal: Path '$2$3' $4, but not ${5:-\'$3\'}.\n" >expected &&
-+	printf "Did you mean '$1:$2$3'${2:+ aka \'$1:./$3\'}?\n" >>expected &&
- 	test_cmp expected error
- }
- 
diff --git a/git-core.spec b/git-core.spec
index b6aa7d3..a6c689d 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -9,11 +9,11 @@ Summary:	Distributed version control system focused on speed, effectivity and us
 Summary(pl.UTF-8):	Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:		git-core
 Release:	1
-Version:	1.7.5.1
+Version:	1.7.5.2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5:	a49291116e3b0564e069ae989e4db6fb
+# Source0-md5:	f79ab8fe79b35346b499f131cbf381a4
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf