t3902: Protect against OS X normalization
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>
This commit is contained in:
parent
105a6339d8
commit
8b2337a589
@ -25,7 +25,7 @@ for_each_name () {
|
|||||||
for name in \
|
for name in \
|
||||||
Name "Name and a${LF}LF" "Name and an${HT}HT" "Name${DQ}" \
|
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" \
|
"$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
|
do
|
||||||
eval "$1"
|
eval "$1"
|
||||||
done
|
done
|
||||||
@ -33,7 +33,7 @@ for_each_name () {
|
|||||||
|
|
||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
|
|
||||||
mkdir "caractère spécial" &&
|
mkdir "$FN" &&
|
||||||
for_each_name "echo initial >\"\$name\""
|
for_each_name "echo initial >\"\$name\""
|
||||||
git add . &&
|
git add . &&
|
||||||
git commit -q -m Initial &&
|
git commit -q -m Initial &&
|
||||||
@ -51,11 +51,11 @@ Name
|
|||||||
"Name and an\tHT"
|
"Name and an\tHT"
|
||||||
"Name\""
|
"Name\""
|
||||||
With SP in it
|
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\t\347\264\224"
|
||||||
"\346\277\261\351\207\216\n\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\"\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"
|
"\346\277\261\351\207\216\347\264\224"
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@ -65,11 +65,11 @@ Name
|
|||||||
"Name and an\tHT"
|
"Name and an\tHT"
|
||||||
"Name\""
|
"Name\""
|
||||||
With SP in it
|
With SP in it
|
||||||
caractère spécial/file
|
|
||||||
"濱野\t純"
|
"濱野\t純"
|
||||||
"濱野\n純"
|
"濱野\n純"
|
||||||
濱野 純
|
濱野 純
|
||||||
"濱野\"純"
|
"濱野\"純"
|
||||||
|
濱野/file
|
||||||
濱野純
|
濱野純
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user