mirror of
https://github.com/git/git.git
synced 2024-12-27 02:34:47 +08:00
7a98d9ab00
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. See14d30cdfc0(ref-filter: fix memory leak in `free_array_item()`, 2019-07-10),c514c62a4f(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 my6798b08e84(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'sde004e848a(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>
238 lines
5.9 KiB
Bash
Executable File
238 lines
5.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Eric Wong
|
|
#
|
|
|
|
test_description='git svn property tests'
|
|
|
|
TEST_FAILS_SANITIZE_LEAK=true
|
|
. ./lib-git-svn.sh
|
|
|
|
mkdir import
|
|
|
|
a_crlf=
|
|
a_lf=
|
|
a_cr=
|
|
a_ne_crlf=
|
|
a_ne_lf=
|
|
a_ne_cr=
|
|
a_empty=
|
|
a_empty_lf=
|
|
a_empty_cr=
|
|
a_empty_crlf=
|
|
|
|
cd import
|
|
cat >> kw.c <<\EOF
|
|
/* Somebody prematurely put a keyword into this file */
|
|
/* $Id$ */
|
|
EOF
|
|
|
|
printf "Hello\r\nWorld\r\n" > crlf
|
|
a_crlf=$(git hash-object -w crlf)
|
|
printf "Hello\rWorld\r" > cr
|
|
a_cr=$(git hash-object -w cr)
|
|
printf "Hello\nWorld\n" > lf
|
|
a_lf=$(git hash-object -w lf)
|
|
|
|
printf "Hello\r\nWorld" > ne_crlf
|
|
a_ne_crlf=$(git hash-object -w ne_crlf)
|
|
printf "Hello\nWorld" > ne_lf
|
|
a_ne_lf=$(git hash-object -w ne_lf)
|
|
printf "Hello\rWorld" > ne_cr
|
|
a_ne_cr=$(git hash-object -w ne_cr)
|
|
|
|
touch empty
|
|
a_empty=$(git hash-object -w empty)
|
|
printf "\n" > empty_lf
|
|
a_empty_lf=$(git hash-object -w empty_lf)
|
|
printf "\r" > empty_cr
|
|
a_empty_cr=$(git hash-object -w empty_cr)
|
|
printf "\r\n" > empty_crlf
|
|
a_empty_crlf=$(git hash-object -w empty_crlf)
|
|
|
|
svn_cmd import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
|
|
cd ..
|
|
|
|
rm -rf import
|
|
test_expect_success 'checkout working copy from svn' 'svn co "$svnrepo" test_wc'
|
|
test_expect_success 'setup some commits to svn' '
|
|
(
|
|
cd test_wc &&
|
|
echo Greetings >> kw.c &&
|
|
poke kw.c &&
|
|
svn_cmd commit -m "Not yet an Id" &&
|
|
echo Hello world >> kw.c &&
|
|
poke kw.c &&
|
|
svn_cmd commit -m "Modified file, but still not yet an Id" &&
|
|
svn_cmd propset svn:keywords Id kw.c &&
|
|
poke kw.c &&
|
|
svn_cmd commit -m "Propset Id"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'
|
|
test_expect_success 'fetch revisions from svn' 'git svn fetch'
|
|
|
|
name='test svn:keywords ignoring'
|
|
test_expect_success "$name" \
|
|
'git checkout -b mybranch remotes/git-svn &&
|
|
echo Hi again >> kw.c &&
|
|
git commit -a -m "test keywords ignoring" &&
|
|
git svn set-tree remotes/git-svn..mybranch &&
|
|
git pull . remotes/git-svn'
|
|
|
|
expect='/* $Id$ */'
|
|
got="$(sed -ne 2p kw.c)"
|
|
test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'"
|
|
|
|
test_expect_success "propset CR on crlf files" '
|
|
(
|
|
cd test_wc &&
|
|
svn_cmd propset svn:eol-style CR empty &&
|
|
svn_cmd propset svn:eol-style CR crlf &&
|
|
svn_cmd propset svn:eol-style CR ne_crlf &&
|
|
svn_cmd commit -m "propset CR on crlf files"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
|
|
'git svn fetch &&
|
|
git pull . remotes/git-svn &&
|
|
svn_cmd co "$svnrepo" new_wc'
|
|
|
|
for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
|
|
do
|
|
test_expect_success "Comparing $i" "cmp $i new_wc/$i"
|
|
done
|
|
|
|
|
|
cd test_wc
|
|
printf '$Id$\rHello\rWorld\r' > cr
|
|
printf '$Id$\rHello\rWorld' > ne_cr
|
|
a_cr=$(printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin)
|
|
a_ne_cr=$(printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin)
|
|
test_expect_success 'Set CRLF on cr files' \
|
|
'svn_cmd propset svn:eol-style CRLF cr &&
|
|
svn_cmd propset svn:eol-style CRLF ne_cr &&
|
|
svn_cmd propset svn:keywords Id cr &&
|
|
svn_cmd propset svn:keywords Id ne_cr &&
|
|
svn_cmd commit -m "propset CRLF on cr files"'
|
|
cd ..
|
|
test_expect_success 'fetch and pull latest from svn' \
|
|
'git svn fetch && git pull . remotes/git-svn'
|
|
|
|
b_cr="$(git hash-object cr)"
|
|
b_ne_cr="$(git hash-object ne_cr)"
|
|
|
|
test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'"
|
|
test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'"
|
|
|
|
cat > show-ignore.expect <<\EOF
|
|
|
|
# /
|
|
/no-such-file*
|
|
|
|
# /deeply/
|
|
/deeply/no-such-file*
|
|
|
|
# /deeply/nested/
|
|
/deeply/nested/no-such-file*
|
|
|
|
# /deeply/nested/directory/
|
|
/deeply/nested/directory/no-such-file*
|
|
EOF
|
|
|
|
test_expect_success 'test show-ignore' "
|
|
(
|
|
cd test_wc &&
|
|
mkdir -p deeply/nested/directory &&
|
|
touch deeply/nested/directory/.keep &&
|
|
svn_cmd add deeply &&
|
|
svn_cmd up &&
|
|
svn_cmd propset -R svn:ignore '
|
|
no-such-file*
|
|
' . &&
|
|
svn_cmd commit -m 'propset svn:ignore'
|
|
) &&
|
|
git svn show-ignore > show-ignore.got &&
|
|
cmp show-ignore.expect show-ignore.got
|
|
"
|
|
|
|
cat >create-ignore.expect <<\EOF
|
|
/no-such-file*
|
|
EOF
|
|
|
|
expectoid=$(git hash-object create-ignore.expect)
|
|
|
|
cat >create-ignore-index.expect <<EOF
|
|
100644 $expectoid 0 .gitignore
|
|
100644 $expectoid 0 deeply/.gitignore
|
|
100644 $expectoid 0 deeply/nested/.gitignore
|
|
100644 $expectoid 0 deeply/nested/directory/.gitignore
|
|
EOF
|
|
|
|
test_expect_success 'test create-ignore' "
|
|
git svn fetch && git pull . remotes/git-svn &&
|
|
git svn create-ignore &&
|
|
cmp ./.gitignore create-ignore.expect &&
|
|
cmp ./deeply/.gitignore create-ignore.expect &&
|
|
cmp ./deeply/nested/.gitignore create-ignore.expect &&
|
|
cmp ./deeply/nested/directory/.gitignore create-ignore.expect &&
|
|
git ls-files -s >ls_files_result &&
|
|
grep gitignore ls_files_result | cmp - create-ignore-index.expect
|
|
"
|
|
|
|
cat >prop.expect <<\EOF
|
|
|
|
no-such-file*
|
|
|
|
EOF
|
|
cat >prop2.expect <<\EOF
|
|
8
|
|
EOF
|
|
|
|
# This test can be improved: since all the svn:ignore contain the same
|
|
# pattern, it can pass even though the propget did not execute on the
|
|
# right directory.
|
|
test_expect_success 'test propget' '
|
|
test_propget () {
|
|
git svn propget $1 $2 >actual &&
|
|
cmp $3 actual
|
|
} &&
|
|
test_propget svn:ignore . prop.expect &&
|
|
cd deeply &&
|
|
test_propget svn:ignore . ../prop.expect &&
|
|
test_propget svn:entry:committed-rev nested/directory/.keep \
|
|
../prop2.expect &&
|
|
test_propget svn:ignore .. ../prop.expect &&
|
|
test_propget svn:ignore nested/ ../prop.expect &&
|
|
test_propget svn:ignore ./nested ../prop.expect &&
|
|
test_propget svn:ignore .././deeply/nested ../prop.expect
|
|
'
|
|
|
|
cat >prop.expect <<\EOF
|
|
Properties on '.':
|
|
svn:entry:committed-date
|
|
svn:entry:committed-rev
|
|
svn:entry:last-author
|
|
svn:entry:uuid
|
|
svn:ignore
|
|
EOF
|
|
cat >prop2.expect <<\EOF
|
|
Properties on 'nested/directory/.keep':
|
|
svn:entry:committed-date
|
|
svn:entry:committed-rev
|
|
svn:entry:last-author
|
|
svn:entry:uuid
|
|
EOF
|
|
|
|
test_expect_success 'test proplist' "
|
|
git svn proplist . >actual &&
|
|
cmp prop.expect actual &&
|
|
|
|
git svn proplist nested/directory/.keep >actual &&
|
|
cmp prop2.expect actual
|
|
"
|
|
|
|
test_done
|