2007-07-16 06:53:50 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Eric Wong
|
|
|
|
|
|
|
|
|
2008-09-08 12:02:08 +02:00
|
|
|
test_description='git svn dcommit can commit renames of files with ugly names'
|
2007-07-16 06:53:50 +02:00
|
|
|
|
revisions API: have release_revisions() release "cmdline"
Extend the the release_revisions() function so that it frees the
"cmdline" in the "struct rev_info". This in combination with a
preceding change to free "commits" and "mailmap" means that we can
whitelist another test under "TEST_PASSES_SANITIZE_LEAK=true".
There was a proposal in [1] to do away with xstrdup()-ing this
add_rev_cmdline(), perhaps that would be worthwhile, but for now let's
just free() it.
We could also make that a "char *" in "struct rev_cmdline_entry"
itself, but since we own it let's expose it as a constant to outside
callers. I proposed that in [2] but have since changed my mind. See
14d30cdfc04 (ref-filter: fix memory leak in `free_array_item()`,
2019-07-10), c514c62a4fd (checkout: fix leak of non-existent branch
names, 2020-08-14) and other log history hits for "free((char *)" for
prior art.
This includes the tests we had false-positive passes on before my
6798b08e848 (perl Git.pm: don't ignore signalled failure in
_cmd_close(), 2022-02-01), now they pass for real.
Since there are 66 tests matching t/t[0-9]*git-svn*.sh it's easier to
list those that don't pass than to touch most of those 66. So let's
introduce a "TEST_FAILS_SANITIZE_LEAK=true", which if set in the tests
won't cause lib-git-svn.sh to set "TEST_PASSES_SANITIZE_LEAK=true.
This change also marks all the tests that we removed
"TEST_FAILS_SANITIZE_LEAK=true" from in an earlier commit due to
removing the UNLEAK() from cmd_format_patch(), we can now assert that
its API use doesn't leak any "struct rev_info" memory.
This change also made commit "t5503-tagfollow.sh" pass on current
master, but that would regress when combined with
ps/fetch-atomic-fixup's de004e848a9 (t5503: simplify setup of test
which exercises failure of backfill, 2022-03-03) (through no fault of
that topic, that change started using "git clone" in the test, which
has an outstanding leak). Let's leave that test out for now to avoid
in-flight semantic conflicts.
1. https://lore.kernel.org/git/YUj%2FgFRh6pwrZalY@carlos-mbp.lan/
2. https://lore.kernel.org/git/87o88obkb1.fsf@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13 22:01:47 +02:00
|
|
|
TEST_FAILS_SANITIZE_LEAK=true
|
2007-07-16 06:53:50 +02:00
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
2008-05-04 07:37:59 +02:00
|
|
|
test_expect_success 'load repository with strange names' '
|
2016-07-23 06:26:08 +02:00
|
|
|
svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
|
|
|
|
'
|
|
|
|
|
|
|
|
maybe_start_httpd gtk+
|
2007-07-16 06:53:50 +02:00
|
|
|
|
2008-05-04 07:37:59 +02:00
|
|
|
test_expect_success 'init and fetch repository' '
|
|
|
|
git svn init "$svnrepo" &&
|
2007-07-16 06:53:50 +02:00
|
|
|
git svn fetch &&
|
|
|
|
git reset --hard git-svn
|
2008-05-04 07:37:59 +02:00
|
|
|
'
|
2007-07-16 06:53:50 +02:00
|
|
|
|
|
|
|
test_expect_success 'create file in existing ugly and empty dir' '
|
2009-11-16 03:57:16 +01:00
|
|
|
mkdir -p "#{bad_directory_name}" &&
|
2007-07-16 06:53:50 +02:00
|
|
|
echo hi > "#{bad_directory_name}/ foo" &&
|
|
|
|
git update-index --add "#{bad_directory_name}/ foo" &&
|
|
|
|
git commit -m "new file in ugly parent" &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rename ugly file' '
|
|
|
|
git mv "#{bad_directory_name}/ foo" "file name with feces" &&
|
|
|
|
git commit -m "rename ugly file" &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rename pretty file' '
|
|
|
|
echo :x > pretty &&
|
|
|
|
git update-index --add pretty &&
|
|
|
|
git commit -m "pretty :x" &&
|
|
|
|
git svn dcommit &&
|
2009-11-16 03:57:16 +01:00
|
|
|
mkdir -p regular_dir_name &&
|
2007-07-16 06:53:50 +02:00
|
|
|
git mv pretty regular_dir_name/pretty &&
|
|
|
|
git commit -m "moved pretty file" &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rename pretty file into ugly one' '
|
|
|
|
git mv regular_dir_name/pretty "#{bad_directory_name}/ booboo" &&
|
|
|
|
git commit -m booboo &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
|
|
|
|
2008-05-11 02:14:49 +02:00
|
|
|
test_expect_success 'add a file with plus signs' '
|
|
|
|
echo .. > +_+ &&
|
|
|
|
git update-index --add +_+ &&
|
|
|
|
git commit -m plus &&
|
|
|
|
mkdir gtk+ &&
|
|
|
|
git mv +_+ gtk+/_+_ &&
|
|
|
|
git commit -m plus_dir &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
|
|
|
|
2008-05-14 22:45:16 +02:00
|
|
|
test_expect_success 'clone the repository to test rebase' '
|
|
|
|
git svn clone "$svnrepo" test-rebase &&
|
2010-09-07 03:42:54 +02:00
|
|
|
(
|
|
|
|
cd test-rebase &&
|
|
|
|
echo test-rebase >test-rebase &&
|
2008-05-11 02:14:49 +02:00
|
|
|
git add test-rebase &&
|
2010-09-06 20:39:54 +02:00
|
|
|
git commit -m test-rebase
|
2010-09-07 03:42:54 +02:00
|
|
|
)
|
2008-05-14 22:45:16 +02:00
|
|
|
'
|
2008-05-11 02:14:49 +02:00
|
|
|
|
2008-05-14 22:45:16 +02:00
|
|
|
test_expect_success 'make a commit to test rebase' '
|
2008-05-11 02:14:49 +02:00
|
|
|
echo test-rebase-main > test-rebase-main &&
|
|
|
|
git add test-rebase-main &&
|
|
|
|
git commit -m test-rebase-main &&
|
|
|
|
git svn dcommit
|
2008-05-14 22:45:16 +02:00
|
|
|
'
|
2008-05-11 02:14:49 +02:00
|
|
|
|
2008-09-08 12:02:08 +02:00
|
|
|
test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
|
2016-02-08 16:20:31 +01:00
|
|
|
(
|
|
|
|
cd test-rebase &&
|
2008-05-11 02:14:49 +02:00
|
|
|
git svn rebase &&
|
|
|
|
test -e test-rebase-main &&
|
|
|
|
test -e test-rebase
|
2016-02-08 16:20:31 +01:00
|
|
|
)'
|
|
|
|
|
|
|
|
# Without this, LC_ALL=C as set in test-lib.sh, and Cygwin converts
|
|
|
|
# non-ASCII characters in filenames unexpectedly, and causes errors.
|
|
|
|
# https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-specialchars
|
|
|
|
# > Some characters are disallowed in filenames on Windows filesystems. ...
|
|
|
|
# ...
|
|
|
|
# > ... All of the above characters, except for the backslash, are converted
|
|
|
|
# > to special UNICODE characters in the range 0xf000 to 0xf0ff (the
|
|
|
|
# > "Private use area") when creating or accessing files.
|
t: use user-specified utf-8 locale for testing svn
In some test-cases, UTF-8 locale is required. To find such locale,
we're using the first available UTF-8 locale that returned by
"locale -a".
However, the locale(1) utility is unavailable on some systems,
e.g. Linux with musl libc.
However, without "locale -a", we can't guess provided UTF-8 locale.
Add a Makefile knob GIT_TEST_UTF8_LOCALE and activate it for
linux-musl in our CI system.
Rename t/lib-git-svn.sh:prepare_a_utf8_locale to prepare_utf8_locale,
since we no longer prepare the variable named "a_utf8_locale",
but set up a fallback value for GIT_TEST_UTF8_LOCALE instead.
The fallback will be LC_ALL, LANG environment variable,
or the first UTF-8 locale from output of "locale -a", in that order.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-06-08 08:56:28 +02:00
|
|
|
prepare_utf8_locale
|
2016-03-23 11:55:20 +01:00
|
|
|
test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 new file on dcommit' '
|
t: use user-specified utf-8 locale for testing svn
In some test-cases, UTF-8 locale is required. To find such locale,
we're using the first available UTF-8 locale that returned by
"locale -a".
However, the locale(1) utility is unavailable on some systems,
e.g. Linux with musl libc.
However, without "locale -a", we can't guess provided UTF-8 locale.
Add a Makefile knob GIT_TEST_UTF8_LOCALE and activate it for
linux-musl in our CI system.
Rename t/lib-git-svn.sh:prepare_a_utf8_locale to prepare_utf8_locale,
since we no longer prepare the variable named "a_utf8_locale",
but set up a fallback value for GIT_TEST_UTF8_LOCALE instead.
The fallback will be LC_ALL, LANG environment variable,
or the first UTF-8 locale from output of "locale -a", in that order.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-06-08 08:56:28 +02:00
|
|
|
LC_ALL=$GIT_TEST_UTF8_LOCALE &&
|
2016-02-08 16:20:31 +01:00
|
|
|
export LC_ALL &&
|
|
|
|
neq=$(printf "\201\202") &&
|
|
|
|
git config svn.pathnameencoding cp932 &&
|
|
|
|
echo neq >"$neq" &&
|
|
|
|
git add "$neq" &&
|
|
|
|
git commit -m "neq" &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
2008-05-11 02:14:49 +02:00
|
|
|
|
2016-02-08 16:21:02 +01:00
|
|
|
# See the comment on the above test for setting of LC_ALL.
|
2016-03-23 11:55:20 +01:00
|
|
|
test_expect_success !MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 rename on dcommit' '
|
t: use user-specified utf-8 locale for testing svn
In some test-cases, UTF-8 locale is required. To find such locale,
we're using the first available UTF-8 locale that returned by
"locale -a".
However, the locale(1) utility is unavailable on some systems,
e.g. Linux with musl libc.
However, without "locale -a", we can't guess provided UTF-8 locale.
Add a Makefile knob GIT_TEST_UTF8_LOCALE and activate it for
linux-musl in our CI system.
Rename t/lib-git-svn.sh:prepare_a_utf8_locale to prepare_utf8_locale,
since we no longer prepare the variable named "a_utf8_locale",
but set up a fallback value for GIT_TEST_UTF8_LOCALE instead.
The fallback will be LC_ALL, LANG environment variable,
or the first UTF-8 locale from output of "locale -a", in that order.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-06-08 08:56:28 +02:00
|
|
|
LC_ALL=$GIT_TEST_UTF8_LOCALE &&
|
2016-02-08 16:21:02 +01:00
|
|
|
export LC_ALL &&
|
|
|
|
inf=$(printf "\201\207") &&
|
|
|
|
git config svn.pathnameencoding cp932 &&
|
|
|
|
echo inf >"$inf" &&
|
|
|
|
git add "$inf" &&
|
|
|
|
git commit -m "inf" &&
|
|
|
|
git svn dcommit &&
|
|
|
|
git mv "$inf" inf &&
|
|
|
|
git commit -m "inf rename" &&
|
|
|
|
git svn dcommit
|
|
|
|
'
|
|
|
|
|
2007-07-16 06:53:50 +02:00
|
|
|
test_done
|