From 8b2337a5893479ee18dfb21a1d4aa5fc1608872d Mon Sep 17 00:00:00 2001
From: Brian Gernhardt <brian@gernhardtsoftware.com>
Date: Mon, 8 Feb 2010 23:07:25 -0500
Subject: [PATCH] t3902: Protect against OS X normalization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
8424981: "Fix invalid read in quote_c_style_counted" introduced a test
that used "caractère spécial" as a directory name.
Git creates it as "caract\303\250re sp\303\251cial"
OS X stores it as "caracte\314\200re spe\314\201cial"
To work around this problem, use the already introduced $FN as the
directory name.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t3902-quoted.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh
index 14da45fe5a..29103f65dc 100755
--- a/t/t3902-quoted.sh
+++ b/t/t3902-quoted.sh
@@ -25,7 +25,7 @@ for_each_name () {
for name in \
Name "Name and a${LF}LF" "Name and an${HT}HT" "Name${DQ}" \
"$FN$HT$GN" "$FN$LF$GN" "$FN $GN" "$FN$GN" "$FN$DQ$GN" \
- "With SP in it" "caractère spécial/file"
+ "With SP in it" "$FN/file"
do
eval "$1"
done
@@ -33,7 +33,7 @@ for_each_name () {
test_expect_success setup '
- mkdir "caractère spécial" &&
+ mkdir "$FN" &&
for_each_name "echo initial >\"\$name\""
git add . &&
git commit -q -m Initial &&
@@ -51,11 +51,11 @@ Name
"Name and an\tHT"
"Name\""
With SP in it
-"caract\303\250re sp\303\251cial/file"
"\346\277\261\351\207\216\t\347\264\224"
"\346\277\261\351\207\216\n\347\264\224"
"\346\277\261\351\207\216 \347\264\224"
"\346\277\261\351\207\216\"\347\264\224"
+"\346\277\261\351\207\216/file"
"\346\277\261\351\207\216\347\264\224"
EOF
@@ -65,11 +65,11 @@ Name
"Name and an\tHT"
"Name\""
With SP in it
-caractère spécial/file
"濱野\t純"
"濱野\n純"
濱野 純
"濱野\"純"
+濱野/file
濱野純
EOF