2009-12-03 03:53:54 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='Test notes trees that also contain non-notes'
|
|
|
|
|
|
2020-11-18 23:44:23 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
2009-12-03 03:53:54 +00:00
|
|
|
. ./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 a couple of commits" '
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
cat <<INPUT_END >input &&
|
2020-11-18 23:44:23 +00:00
|
|
|
commit refs/heads/main
|
2009-12-03 03:53:54 +00:00
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
data <<COMMIT
|
|
|
|
|
commit #1
|
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
|
|
M 644 inline file
|
|
|
|
|
data <<EOF
|
|
|
|
|
file in commit #1
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
cat <<INPUT_END >>input &&
|
2020-11-18 23:44:23 +00:00
|
|
|
commit refs/heads/main
|
2009-12-03 03:53:54 +00:00
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
data <<COMMIT
|
|
|
|
|
commit #2
|
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
|
|
M 644 inline file
|
|
|
|
|
data <<EOF
|
|
|
|
|
file in commit #2
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
git fast-import --quiet <input
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success "create a notes tree with both notes and non-notes" '
|
|
|
|
|
|
2020-11-18 23:44:23 +00:00
|
|
|
commit1=$(git rev-parse refs/heads/main^) &&
|
|
|
|
|
commit2=$(git rev-parse refs/heads/main) &&
|
2009-12-03 03:53:54 +00:00
|
|
|
test_tick &&
|
|
|
|
|
cat <<INPUT_END >input &&
|
|
|
|
|
commit refs/notes/commits
|
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
data <<COMMIT
|
|
|
|
|
notes commit #1
|
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
|
|
N inline $commit1
|
|
|
|
|
data <<EOF
|
|
|
|
|
note for commit #1
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
N inline $commit2
|
|
|
|
|
data <<EOF
|
|
|
|
|
note for commit #2
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
test_tick &&
|
|
|
|
|
cat <<INPUT_END >>input &&
|
|
|
|
|
commit refs/notes/commits
|
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
data <<COMMIT
|
|
|
|
|
notes commit #2
|
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
|
|
M 644 inline foobar/non-note.txt
|
|
|
|
|
data <<EOF
|
|
|
|
|
A non-note in a notes tree
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
N inline $commit2
|
|
|
|
|
data <<EOF
|
|
|
|
|
edited note for commit #2
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
test_tick &&
|
|
|
|
|
cat <<INPUT_END >>input &&
|
|
|
|
|
commit refs/notes/commits
|
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
data <<COMMIT
|
|
|
|
|
notes commit #3
|
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
|
|
N inline $commit1
|
|
|
|
|
data <<EOF
|
|
|
|
|
edited note for commit #1
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
M 644 inline deadbeef
|
|
|
|
|
data <<EOF
|
|
|
|
|
non-note with SHA1-like name
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
M 644 inline de/adbeef
|
|
|
|
|
data <<EOF
|
|
|
|
|
another non-note with SHA1-like name
|
|
|
|
|
EOF
|
|
|
|
|
|
Teach notes code to properly preserve non-notes in the notes tree
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>
2010-02-13 21:28:23 +00:00
|
|
|
M 644 inline de/adbeefdeadbeefdeadbeefdeadbeefdeadbeef
|
|
|
|
|
data <<EOF
|
|
|
|
|
This is actually a valid note, albeit to a non-existing object.
|
|
|
|
|
It is needed in order to trigger the "mishandling" of the dead/beef non-note.
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
M 644 inline dead/beef
|
|
|
|
|
data <<EOF
|
|
|
|
|
yet another non-note with SHA1-like name
|
|
|
|
|
EOF
|
|
|
|
|
|
2009-12-03 03:53:54 +00:00
|
|
|
INPUT_END
|
|
|
|
|
git fast-import --quiet <input &&
|
|
|
|
|
git config core.notesRef refs/notes/commits
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
cat >expect <<EXPECT_END
|
|
|
|
|
commit #2
|
|
|
|
|
edited note for commit #2
|
|
|
|
|
commit #1
|
|
|
|
|
edited note for commit #1
|
|
|
|
|
EXPECT_END
|
|
|
|
|
|
|
|
|
|
test_expect_success "verify contents of notes" '
|
|
|
|
|
|
|
|
|
|
git log | grep "^ " > actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
cat >expect_nn1 <<EXPECT_END
|
|
|
|
|
A non-note in a notes tree
|
|
|
|
|
EXPECT_END
|
|
|
|
|
cat >expect_nn2 <<EXPECT_END
|
|
|
|
|
non-note with SHA1-like name
|
|
|
|
|
EXPECT_END
|
|
|
|
|
cat >expect_nn3 <<EXPECT_END
|
|
|
|
|
another non-note with SHA1-like name
|
|
|
|
|
EXPECT_END
|
Teach notes code to properly preserve non-notes in the notes tree
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>
2010-02-13 21:28:23 +00:00
|
|
|
cat >expect_nn4 <<EXPECT_END
|
|
|
|
|
yet another non-note with SHA1-like name
|
|
|
|
|
EXPECT_END
|
2009-12-03 03:53:54 +00:00
|
|
|
|
|
|
|
|
test_expect_success "verify contents of non-notes" '
|
|
|
|
|
|
|
|
|
|
git cat-file -p refs/notes/commits:foobar/non-note.txt > actual_nn1 &&
|
|
|
|
|
test_cmp expect_nn1 actual_nn1 &&
|
|
|
|
|
git cat-file -p refs/notes/commits:deadbeef > actual_nn2 &&
|
|
|
|
|
test_cmp expect_nn2 actual_nn2 &&
|
|
|
|
|
git cat-file -p refs/notes/commits:de/adbeef > actual_nn3 &&
|
Teach notes code to properly preserve non-notes in the notes tree
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>
2010-02-13 21:28:23 +00:00
|
|
|
test_cmp expect_nn3 actual_nn3 &&
|
|
|
|
|
git cat-file -p refs/notes/commits:dead/beef > actual_nn4 &&
|
|
|
|
|
test_cmp expect_nn4 actual_nn4
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success "git-notes preserves non-notes" '
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
2010-02-13 21:28:34 +00:00
|
|
|
git notes add -f -m "foo bar"
|
Teach notes code to properly preserve non-notes in the notes tree
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>
2010-02-13 21:28:23 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success "verify contents of non-notes after git-notes" '
|
|
|
|
|
|
|
|
|
|
git cat-file -p refs/notes/commits:foobar/non-note.txt > actual_nn1 &&
|
|
|
|
|
test_cmp expect_nn1 actual_nn1 &&
|
|
|
|
|
git cat-file -p refs/notes/commits:deadbeef > actual_nn2 &&
|
|
|
|
|
test_cmp expect_nn2 actual_nn2 &&
|
|
|
|
|
git cat-file -p refs/notes/commits:de/adbeef > actual_nn3 &&
|
|
|
|
|
test_cmp expect_nn3 actual_nn3 &&
|
|
|
|
|
git cat-file -p refs/notes/commits:dead/beef > actual_nn4 &&
|
|
|
|
|
test_cmp expect_nn4 actual_nn4
|
2009-12-03 03:53:54 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_done
|