Skip to content

Commit

Permalink
t3902: Protect against OS X normalization
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Feb 9, 2010
1 parent 105a633 commit 8b2337a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions t/t3902-quoted.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ 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
}

test_expect_success setup '
mkdir "caractère spécial" &&
mkdir "$FN" &&
for_each_name "echo initial >\"\$name\""
git add . &&
git commit -q -m Initial &&
Expand All @@ -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

Expand All @@ -65,11 +65,11 @@ Name
"Name and an\tHT"
"Name\""
With SP in it
caractère spécial/file
"濱野\t純"
"濱野\n純"
濱野 純
"濱野\"純"
濱野/file
濱野純
EOF

Expand Down

0 comments on commit 8b2337a

Please sign in to comment.