mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
851c2b3791
The note tree structure allows for non-note entries to coexist with note entries in a notes tree. Although we certainly expect there to be very few non-notes in a notes tree, we should still support them to a certain degree. This patch teaches the notes code to preserve non-notes when updating the notes tree with write_notes_tree(). Non-notes are not affected by fanout restructuring. For non-notes to be handled correctly, we can no longer allow subtree entries that do not match the fanout structure produced by the notes code itself. This means that fanouts like 4/36, 6/34, 8/32, 4/4/32, etc. are no longer recognized as note subtrees; only 2-based fanouts are allowed (2/38, 2/2/36, 2/2/2/34, etc.). Since the notes code has never at any point _produced_ non-2-based fanouts, it is highly unlikely that this change will cause problems for anyone. The patch also adds some tests verifying the correct handling of non-notes in a notes tree. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
194 lines
5 KiB
Bash
Executable file
194 lines
5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test commit notes organized in subtrees'
|
|
|
|
. ./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));
|
|
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
|
|
commit refs/heads/master
|
|
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/master |
|
|
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
|
|
) |
|
|
git fast-import --quiet
|
|
}
|
|
|
|
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/master |
|
|
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/master |
|
|
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 " second note for commit #$i" &&
|
|
i=$(($i-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
|