Skip to content
/ git Public
forked from git/git

Commit

Permalink
test-bzr: portable shell and utf-8 strings for Mac OS
Browse files Browse the repository at this point in the history
Make the shell script more portable:
- Split export X=Y into 2 lines
- Use printf instead of echo -e

Use UTF-8 code points which are not decomposed by the filesystem:
 Code points like "á" will be decomposed by Mac OS X.
 bzr is unable to find the file "á" on disk.
 Use code points from unicode which can not be decomposed.
 In other words, the precompsed form use the same bytes as decomposed.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Acked-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
tboegi authored and gitster committed Apr 12, 2013
1 parent caa7d79 commit 924f6c3
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions contrib/remote-helpers/test-bzr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,39 +169,39 @@ test_expect_success 'fetch utf-8 filenames' '
mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
export LC_ALL=en_US.UTF-8
LC_ALL=en_US.UTF-8
export LC_ALL
(
bzr init bzrrepo &&
cd bzrrepo &&
echo test >> "áéíóú" &&
bzr add "áéíóú" &&
echo test >> "îø∫∆" &&
bzr add "îø∫∆" &&
bzr commit -m utf-8 &&
echo test >> "áéíóú" &&
bzr commit -m utf-8 &&
bzr rm "îø∫∆" &&
bzr mv "áéíóú" "åß∂" &&
bzr commit -m utf-8
echo test >> "ærø" &&
bzr add "ærø" &&
echo test >> "ø~?" &&
bzr add "ø~?" &&
bzr commit -m add-utf-8 &&
echo test >> "ærø" &&
bzr commit -m test-utf-8 &&
bzr rm "ø~?" &&
bzr mv "ærø" "ø~?" &&
bzr commit -m bzr-mv-utf-8
) &&
(
git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo &&
git ls-files > ../actual
git -c core.quotepath=false ls-files > ../actual
) &&
echo "\"\\303\\245\\303\\237\\342\\210\\202\"" > expected &&
echo "ø~?" > expected &&
test_cmp expected actual
'

test_expect_success 'push utf-8 filenames' '
mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
export LC_ALL=en_US.UTF-8
LC_ALL=en_US.UTF-8
export LC_ALL
(
bzr init bzrrepo &&
Expand All @@ -216,15 +216,15 @@ test_expect_success 'push utf-8 filenames' '
git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo &&
echo test >> "áéíóú" &&
git add "áéíóú" &&
echo test >> "ærø" &&
git add "ærø" &&
git commit -m utf-8 &&
git push
) &&
(cd bzrrepo && bzr ls > ../actual) &&
echo -e "content\náéíóú" > expected &&
printf "content\nærø\n" > expected &&
test_cmp expected actual
'

Expand Down

0 comments on commit 924f6c3

Please sign in to comment.