summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/remote-helpers/test-bzr.sh38
1 files changed, 19 insertions, 19 deletions
diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh
index e800c97fcf..34666e1d0f 100755
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -169,31 +169,30 @@ 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
'
@@ -201,7 +200,8 @@ 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 &&
@@ -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
'