diff options
| -rw-r--r-- | contrib/git-svn/Makefile | 5 | ||||
| -rw-r--r-- | contrib/git-svn/t/t0000-contrib-git-svn.sh | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index d73aa5641..6aedb10f1 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -32,9 +32,10 @@ test: git-svn cd t && $(SHELL) ./t0000-contrib-git-svn.sh $(TEST_FLAGS) cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS) +# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL full-test: - $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 - $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 + $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C + $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \ LC_ALL=en_US.UTF-8 $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \ diff --git a/contrib/git-svn/t/t0000-contrib-git-svn.sh b/contrib/git-svn/t/t0000-contrib-git-svn.sh index f896e2c2a..0f5274664 100644 --- a/contrib/git-svn/t/t0000-contrib-git-svn.sh +++ b/contrib/git-svn/t/t0000-contrib-git-svn.sh @@ -194,8 +194,12 @@ test_expect_success "$name" \ diff -u a b" name='check imported tree checksums expected tree checksums' -cat > expected <<\EOF -tree f735671b89a7eb30cab1d8597de35bd4271ab813 +rm -f expected +if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$' +then + echo tree f735671b89a7eb30cab1d8597de35bd4271ab813 > expected +fi +cat >> expected <<\EOF tree 4b9af72bb861eaed053854ec502cf7df72618f0f tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1 tree 0b094cbff17168f24c302e297f55bfac65eb8bd3 |