up to 2.9.0

[packages/git-core.git] / git-core-tests.patch

diff --git a/git-core-tests.patch b/git-core-tests.patch
index 473e51982c0ecd0cb4997bb3fda5562036046527..0bbfc3db08badc30e0501cf23f6b5f0cd6801f75 100644 (file)
--- 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
- }
-