mirror of
https://github.com/git/git.git
synced 2024-12-15 12:53:36 +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>
200 lines
5.2 KiB
Bash
Executable File
200 lines
5.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Test commit notes organized in subtrees'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
number_of_commits=100
|
|
|
|
start_note_commit () {
|
|
test_tick &&
|
|
cat <<INPUT_END
|
|
commit refs/notes/commits
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
data <<COMMIT
|
|
notes
|
|
COMMIT
|
|
|
|
from refs/notes/commits^0
|
|
deleteall
|
|
INPUT_END
|
|
|
|
}
|
|
|
|
verify_notes () {
|
|
git log | grep "^ " > output &&
|
|
i=$number_of_commits &&
|
|
while [ $i -gt 0 ]; do
|
|
echo " commit #$i" &&
|
|
echo " note for commit #$i" &&
|
|
i=$(($i-1)) || return 1
|
|
done > expect &&
|
|
test_cmp expect output
|
|
}
|
|
|
|
test_expect_success "setup: create $number_of_commits commits" '
|
|
|
|
(
|
|
nr=0 &&
|
|
while [ $nr -lt $number_of_commits ]; do
|
|
nr=$(($nr+1)) &&
|
|
test_tick &&
|
|
cat <<INPUT_END || return 1
|
|
commit refs/heads/main
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
data <<COMMIT
|
|
commit #$nr
|
|
COMMIT
|
|
|
|
M 644 inline file
|
|
data <<EOF
|
|
file in commit #$nr
|
|
EOF
|
|
|
|
INPUT_END
|
|
|
|
done &&
|
|
test_tick &&
|
|
cat <<INPUT_END
|
|
commit refs/notes/commits
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
data <<COMMIT
|
|
no notes
|
|
COMMIT
|
|
|
|
deleteall
|
|
|
|
INPUT_END
|
|
|
|
) |
|
|
git fast-import --quiet &&
|
|
git config core.notesRef refs/notes/commits
|
|
'
|
|
|
|
test_sha1_based () {
|
|
(
|
|
start_note_commit &&
|
|
nr=$number_of_commits &&
|
|
git rev-list refs/heads/main >out &&
|
|
while read sha1; do
|
|
note_path=$(echo "$sha1" | sed "$1")
|
|
cat <<INPUT_END &&
|
|
M 100644 inline $note_path
|
|
data <<EOF
|
|
note for commit #$nr
|
|
EOF
|
|
|
|
INPUT_END
|
|
|
|
nr=$(($nr-1))
|
|
done <out
|
|
) >gfi &&
|
|
git fast-import --quiet <gfi
|
|
}
|
|
|
|
test_expect_success 'test notes in 2/38-fanout' 'test_sha1_based "s|^..|&/|"'
|
|
test_expect_success 'verify notes in 2/38-fanout' 'verify_notes'
|
|
|
|
test_expect_success 'test notes in 2/2/36-fanout' 'test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"'
|
|
test_expect_success 'verify notes in 2/2/36-fanout' 'verify_notes'
|
|
|
|
test_expect_success 'test notes in 2/2/2/34-fanout' 'test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"'
|
|
test_expect_success 'verify notes in 2/2/2/34-fanout' 'verify_notes'
|
|
|
|
test_same_notes () {
|
|
(
|
|
start_note_commit &&
|
|
nr=$number_of_commits &&
|
|
git rev-list refs/heads/main |
|
|
while read sha1; do
|
|
first_note_path=$(echo "$sha1" | sed "$1")
|
|
second_note_path=$(echo "$sha1" | sed "$2")
|
|
cat <<INPUT_END &&
|
|
M 100644 inline $second_note_path
|
|
data <<EOF
|
|
note for commit #$nr
|
|
EOF
|
|
|
|
M 100644 inline $first_note_path
|
|
data <<EOF
|
|
note for commit #$nr
|
|
EOF
|
|
|
|
INPUT_END
|
|
|
|
nr=$(($nr-1))
|
|
done
|
|
) |
|
|
git fast-import --quiet
|
|
}
|
|
|
|
test_expect_success 'test same notes in no fanout and 2/38-fanout' 'test_same_notes "s|^..|&/|" ""'
|
|
test_expect_success 'verify same notes in no fanout and 2/38-fanout' 'verify_notes'
|
|
|
|
test_expect_success 'test same notes in no fanout and 2/2/36-fanout' 'test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""'
|
|
test_expect_success 'verify same notes in no fanout and 2/2/36-fanout' 'verify_notes'
|
|
|
|
test_expect_success 'test same notes in 2/38-fanout and 2/2/36-fanout' 'test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"'
|
|
test_expect_success 'verify same notes in 2/38-fanout and 2/2/36-fanout' 'verify_notes'
|
|
|
|
test_expect_success 'test same notes in 2/2/2/34-fanout and 2/2/36-fanout' 'test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"'
|
|
test_expect_success 'verify same notes in 2/2/2/34-fanout and 2/2/36-fanout' 'verify_notes'
|
|
|
|
test_concatenated_notes () {
|
|
(
|
|
start_note_commit &&
|
|
nr=$number_of_commits &&
|
|
git rev-list refs/heads/main |
|
|
while read sha1; do
|
|
first_note_path=$(echo "$sha1" | sed "$1")
|
|
second_note_path=$(echo "$sha1" | sed "$2")
|
|
cat <<INPUT_END &&
|
|
M 100644 inline $second_note_path
|
|
data <<EOF
|
|
second note for commit #$nr
|
|
EOF
|
|
|
|
M 100644 inline $first_note_path
|
|
data <<EOF
|
|
first note for commit #$nr
|
|
EOF
|
|
|
|
INPUT_END
|
|
|
|
nr=$(($nr-1))
|
|
done
|
|
) |
|
|
git fast-import --quiet
|
|
}
|
|
|
|
verify_concatenated_notes () {
|
|
git log | grep "^ " > output &&
|
|
i=$number_of_commits &&
|
|
while [ $i -gt 0 ]; do
|
|
echo " commit #$i" &&
|
|
echo " first note for commit #$i" &&
|
|
echo " " &&
|
|
echo " second note for commit #$i" &&
|
|
i=$(($i-1)) || return 1
|
|
done > expect &&
|
|
test_cmp expect output
|
|
}
|
|
|
|
test_expect_success 'test notes in no fanout concatenated with 2/38-fanout' 'test_concatenated_notes "s|^..|&/|" ""'
|
|
test_expect_success 'verify notes in no fanout concatenated with 2/38-fanout' 'verify_concatenated_notes'
|
|
|
|
test_expect_success 'test notes in no fanout concatenated with 2/2/36-fanout' 'test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""'
|
|
test_expect_success 'verify notes in no fanout concatenated with 2/2/36-fanout' 'verify_concatenated_notes'
|
|
|
|
test_expect_success 'test notes in 2/38-fanout concatenated with 2/2/36-fanout' 'test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"'
|
|
test_expect_success 'verify notes in 2/38-fanout concatenated with 2/2/36-fanout' 'verify_concatenated_notes'
|
|
|
|
test_expect_success 'test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout' 'test_concatenated_notes "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|" "s|^\(..\)\(..\)|\1/\2/|"'
|
|
test_expect_success 'verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout' 'verify_concatenated_notes'
|
|
|
|
test_done
|