development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-06-30 22:54:27 +00:00
Code Issues Projects Releases Wiki Activity

t0018: two small fixes

Browse Source 
Even though the three tests that were recently added started their
here-doc with "<<-\EOF", it did not take advantage of that and
instead wrote the here-doc payload abut to the left edge.  Use a tabs
to indent these lines.

More importantly, because these all hardcode the expected output,
which contains the current branch name, they break the CI job that
uses 'main' as the default branch name.

Use

    GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=trunk
    export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

between the test_description line and ". ./test-lib.sh" line to
force the initial branch name to 'trunk' and expect it to show in
the output.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2024-05-07 17:40:51 -07:00
parent b79deeb554
commit cbdc83f151
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
t/t0018-advice.sh
View File

@ -2,6 +2,9 @@
test_description='Test advise_if_enabled functionality'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=trunk
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
@ -31,15 +34,15 @@ test_expect_success 'advice should not be printed when config variable is set to
test_expect_success 'advice should not be printed when --no-advice is used' '
q_to_tab >expect <<-\EOF &&
On branch master
On branch trunk
No commits yet
No commits yet
Untracked files:
QREADME
Untracked files:
QREADME
nothing added to commit but untracked files present
EOF
nothing added to commit but untracked files present
EOF
test_when_finished "rm -fr advice-test" &&
git init advice-test &&
@ -53,15 +56,15 @@ EOF
test_expect_success 'advice should not be printed when GIT_ADVICE is set to false' '
q_to_tab >expect <<-\EOF &&
On branch master
On branch trunk
No commits yet
No commits yet
Untracked files:
QREADME
Untracked files:
QREADME
nothing added to commit but untracked files present
EOF
nothing added to commit but untracked files present
EOF
test_when_finished "rm -fr advice-test" &&
git init advice-test &&
@ -75,16 +78,16 @@ EOF
test_expect_success 'advice should be printed when GIT_ADVICE is set to true' '
q_to_tab >expect <<-\EOF &&
On branch master
On branch trunk
No commits yet
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
QREADME
Untracked files:
(use "git add <file>..." to include in what will be committed)
QREADME
nothing added to commit but untracked files present (use "git add" to track)
EOF
nothing added to commit but untracked files present (use "git add" to track)
EOF
test_when_finished "rm -fr advice-test" &&
git init advice-test &&