334afbc76f
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>
138 lines
3.7 KiB
Bash
Executable File
138 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='basic tests for fast-export --anonymize'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup simple repo' '
|
|
test_commit base &&
|
|
test_commit foo &&
|
|
test_commit retain-me &&
|
|
git checkout -b other HEAD^ &&
|
|
mkdir subdir &&
|
|
test_commit subdir/bar &&
|
|
test_commit subdir/xyzzy &&
|
|
fake_commit=$(echo $ZERO_OID | sed s/0/a/) &&
|
|
git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
|
|
git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
|
|
git commit -m "add gitlink" &&
|
|
git tag -m "annotated tag" mytag
|
|
'
|
|
|
|
test_expect_success 'export anonymized stream' '
|
|
git fast-export --anonymize --all \
|
|
--anonymize-map=retain-me \
|
|
--anonymize-map=xyzzy:custom-name \
|
|
--anonymize-map=other \
|
|
>stream
|
|
'
|
|
|
|
# this also covers commit messages
|
|
test_expect_success 'stream omits path names' '
|
|
! grep base stream &&
|
|
! grep foo stream &&
|
|
! grep subdir stream &&
|
|
! grep bar stream &&
|
|
! grep xyzzy stream
|
|
'
|
|
|
|
test_expect_success 'stream contains user-specified names' '
|
|
grep retain-me stream &&
|
|
grep custom-name stream
|
|
'
|
|
|
|
test_expect_success 'stream omits gitlink oids' '
|
|
# avoid relying on the whole oid to remain hash-agnostic; this is
|
|
# plenty to be unique within our test case
|
|
! grep a000000000000000000 stream
|
|
'
|
|
|
|
test_expect_success 'stream retains other as refname' '
|
|
grep other stream
|
|
'
|
|
|
|
test_expect_success 'stream omits other refnames' '
|
|
! grep master stream &&
|
|
! grep mytag stream
|
|
'
|
|
|
|
test_expect_success 'stream omits identities' '
|
|
! grep "$GIT_COMMITTER_NAME" stream &&
|
|
! grep "$GIT_COMMITTER_EMAIL" stream &&
|
|
! grep "$GIT_AUTHOR_NAME" stream &&
|
|
! grep "$GIT_AUTHOR_EMAIL" stream
|
|
'
|
|
|
|
test_expect_success 'stream omits tag message' '
|
|
! grep "annotated tag" stream
|
|
'
|
|
|
|
# NOTE: we chdir to the new, anonymized repository
|
|
# after this. All further tests should assume this.
|
|
test_expect_success 'import stream to new repository' '
|
|
git init new &&
|
|
cd new &&
|
|
git fast-import <../stream
|
|
'
|
|
|
|
test_expect_success 'result has two branches' '
|
|
git for-each-ref --format="%(refname)" refs/heads >branches &&
|
|
test_line_count = 2 branches &&
|
|
other_branch=refs/heads/other &&
|
|
main_branch=$(grep -v $other_branch branches)
|
|
'
|
|
|
|
test_expect_success 'repo has original shape and timestamps' '
|
|
shape () {
|
|
git log --format="%m %ct" --left-right --boundary "$@"
|
|
} &&
|
|
(cd .. && shape master...other) >expect &&
|
|
shape $main_branch...$other_branch >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'root tree has original shape' '
|
|
# the output entries are not necessarily in the same
|
|
# order, but we should at least have the same set of
|
|
# object types.
|
|
git -C .. ls-tree HEAD >orig-root &&
|
|
cut -d" " -f2 <orig-root | sort >expect &&
|
|
git ls-tree $other_branch >root &&
|
|
cut -d" " -f2 <root | sort >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'paths in subdir ended up in one tree' '
|
|
git -C .. ls-tree other:subdir >orig-subdir &&
|
|
cut -d" " -f2 <orig-subdir | sort >expect &&
|
|
tree=$(grep tree root | cut -f2) &&
|
|
git ls-tree $other_branch:$tree >tree &&
|
|
cut -d" " -f2 <tree >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'identical gitlinks got identical oid' '
|
|
awk "/commit/ { print \$3 }" <root | sort -u >commits &&
|
|
test_line_count = 1 commits
|
|
'
|
|
|
|
test_expect_success 'tag points to branch tip' '
|
|
git rev-parse $other_branch >expect &&
|
|
git for-each-ref --format="%(*objectname)" | grep . >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'idents are shared' '
|
|
git log --all --format="%an <%ae>" >authors &&
|
|
sort -u authors >unique &&
|
|
test_line_count = 1 unique &&
|
|
git log --all --format="%cn <%ce>" >committers &&
|
|
sort -u committers >unique &&
|
|
test_line_count = 1 unique &&
|
|
! test_cmp authors committers
|
|
'
|
|
|
|
test_done
|