2010-06-29 07:47:08 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Nazri Ramliy
|
|
|
|
#
|
|
|
|
|
2022-08-05 17:58:34 +00:00
|
|
|
test_description='test "git log --decorate" colors'
|
2010-06-29 07:47:08 +00:00
|
|
|
|
2020-11-18 23:44:27 +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
|
|
|
|
|
2022-04-13 20:01:48 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2010-06-29 07:47:08 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
git config diff.color.commit yellow &&
|
|
|
|
git config color.decorate.branch green &&
|
|
|
|
git config color.decorate.remoteBranch red &&
|
|
|
|
git config color.decorate.tag "reverse bold yellow" &&
|
|
|
|
git config color.decorate.stash magenta &&
|
2022-08-05 17:58:35 +00:00
|
|
|
git config color.decorate.grafted black &&
|
2010-06-29 07:47:08 +00:00
|
|
|
git config color.decorate.HEAD cyan &&
|
|
|
|
|
2017-07-13 14:58:41 +00:00
|
|
|
c_reset="<RESET>" &&
|
2010-06-29 07:47:08 +00:00
|
|
|
|
2017-07-13 14:58:41 +00:00
|
|
|
c_commit="<YELLOW>" &&
|
|
|
|
c_branch="<GREEN>" &&
|
|
|
|
c_remoteBranch="<RED>" &&
|
|
|
|
c_tag="<BOLD;REVERSE;YELLOW>" &&
|
|
|
|
c_stash="<MAGENTA>" &&
|
|
|
|
c_HEAD="<CYAN>" &&
|
2022-08-05 17:58:35 +00:00
|
|
|
c_grafted="<BLACK>" &&
|
2010-06-29 07:47:08 +00:00
|
|
|
|
|
|
|
test_commit A &&
|
|
|
|
git clone . other &&
|
|
|
|
(
|
|
|
|
cd other &&
|
|
|
|
test_commit A1
|
|
|
|
) &&
|
|
|
|
|
|
|
|
git remote add -f other ./other &&
|
|
|
|
test_commit B &&
|
|
|
|
git tag v1.0 &&
|
|
|
|
echo >>A.t &&
|
|
|
|
git stash save Changes to A.t
|
|
|
|
'
|
|
|
|
|
2022-08-05 17:58:34 +00:00
|
|
|
cmp_filtered_decorations () {
|
|
|
|
sed "s/$OID_REGEX/COMMIT_ID/" actual | test_decode_color >filtered &&
|
|
|
|
test_cmp expect filtered
|
|
|
|
}
|
2010-06-29 07:47:08 +00:00
|
|
|
|
|
|
|
# We want log to show all, but the second parent to refs/stash is irrelevant
|
|
|
|
# to this test since it does not contain any decoration, hence --first-parent
|
2022-08-05 17:58:34 +00:00
|
|
|
test_expect_success 'commit decorations colored correctly' '
|
|
|
|
cat >expect <<-EOF &&
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
|
2023-08-20 18:50:09 +00:00
|
|
|
${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
|
|
|
|
${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
|
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
|
2022-08-05 17:58:34 +00:00
|
|
|
${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
|
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
|
2022-08-05 17:58:34 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
|
|
|
|
cmp_filtered_decorations
|
2010-06-29 07:47:08 +00:00
|
|
|
'
|
|
|
|
|
2023-11-02 08:47:01 +00:00
|
|
|
remove_replace_refs () {
|
|
|
|
git for-each-ref 'refs/replace*/**' --format='delete %(refname)' >in &&
|
|
|
|
git update-ref --stdin <in &&
|
|
|
|
rm in
|
|
|
|
}
|
|
|
|
|
2022-08-05 17:58:35 +00:00
|
|
|
test_expect_success 'test coloring with replace-objects' '
|
2023-11-02 08:47:01 +00:00
|
|
|
test_when_finished remove_replace_refs &&
|
2022-08-05 17:58:35 +00:00
|
|
|
test_commit C &&
|
|
|
|
test_commit D &&
|
|
|
|
|
|
|
|
git replace HEAD~1 HEAD~2 &&
|
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
|
2023-08-20 18:50:09 +00:00
|
|
|
${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit})${c_reset} D
|
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_tag}tag: ${c_reset}${c_tag}C${c_reset}${c_commit}, \
|
2022-08-05 17:58:35 +00:00
|
|
|
${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} B
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
|
2022-08-05 17:58:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
|
|
|
|
cmp_filtered_decorations &&
|
|
|
|
git replace -d HEAD~1 &&
|
|
|
|
|
|
|
|
GIT_REPLACE_REF_BASE=refs/replace2/ git replace HEAD~1 HEAD~2 &&
|
|
|
|
GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
|
|
|
|
--no-abbrev --decorate --oneline --color=always HEAD >actual &&
|
|
|
|
cmp_filtered_decorations
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'test coloring with grafted commit' '
|
2023-11-02 08:47:01 +00:00
|
|
|
test_when_finished remove_replace_refs &&
|
2022-08-05 17:58:35 +00:00
|
|
|
|
|
|
|
git replace --graft HEAD HEAD~2 &&
|
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
|
2023-08-20 18:50:09 +00:00
|
|
|
${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit}, \
|
2022-08-05 17:58:35 +00:00
|
|
|
${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} D
|
2023-08-20 18:50:06 +00:00
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
|
|
|
|
${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
|
|
|
|
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
|
|
|
|
${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
|
2022-08-05 17:58:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
|
|
|
|
cmp_filtered_decorations &&
|
|
|
|
git replace -d HEAD &&
|
|
|
|
|
|
|
|
GIT_REPLACE_REF_BASE=refs/replace2/ git replace --graft HEAD HEAD~2 &&
|
|
|
|
GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
|
|
|
|
--no-abbrev --decorate --oneline --color=always HEAD >actual &&
|
|
|
|
cmp_filtered_decorations
|
|
|
|
'
|
|
|
|
|
2010-06-29 07:47:08 +00:00
|
|
|
test_done
|