mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bf/explicit-config-set-in-advice-messages'

Browse Source 
The advice messages now tell the newer 'git config set' command to
set the advice.token configuration variable to squelch a message.

* bf/explicit-config-set-in-advice-messages:
  advice: suggest using subcommand "git config set"
This commit is contained in:
Junio C Hamano
2024-12-15 17:54:27 -08:00
parent ab738b2f1f 6c397d0104
commit e6663b9ac5
19 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
advice.c
View File

@ -93,7 +93,7 @@ static struct {
static const char turn_off_instructions[] = static const char turn_off_instructions[] =
N_("\n" N_("\n"
"Disable this message with \"git config advice.%s false\""); "Disable this message with \"git config set advice.%s false\"");
static void vadvise(const char *advice, int display_instructions, static void vadvise(const char *advice, int display_instructions,
const char *key, va_list params) const char *key, va_list params)

2
commit.c
View File

@ -276,7 +276,7 @@ static int read_graft_file(struct repository *r, const char *graft_file)
"to convert the grafts into replace refs.\n" "to convert the grafts into replace refs.\n"
"\n" "\n"
"Turn this message off by running\n" "Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\"")); "\"git config set advice.graftFileDeprecated false\""));
while (!strbuf_getwholeline(&buf, fp, '\n')) { while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */ /* The format is just "Commit Parent1 Parent2 ...\n" */
struct commit_graft *graft = read_graft_line(&buf); struct commit_graft *graft = read_graft_line(&buf);

2
hook.c
View File

@ -39,7 +39,7 @@ const char *find_hook(struct repository *r, const char *name)
advise(_("The '%s' hook was ignored because " advise(_("The '%s' hook was ignored because "
"it's not set as executable.\n" "it's not set as executable.\n"
"You can disable this warning with " "You can disable this warning with "
"`git config advice.ignoredHook false`."), "`git config set advice.ignoredHook false`."),
path.buf); path.buf);
} }
} }

2
object-name.c
View File

@ -952,7 +952,7 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
"\n" "\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n" "examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""); "running \"git config set advice.objectNameWarning false\"");
struct object_id tmp_oid; struct object_id tmp_oid;
char *real_ref = NULL; char *real_ref = NULL;
int refs_found = 0; int refs_found = 0;

2
t/t0018-advice.sh
View File

@ -10,7 +10,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_expect_success 'advice should be printed when config variable is unset' ' test_expect_success 'advice should be printed when config variable is unset' '
cat >expect <<-\EOF && cat >expect <<-\EOF &&
hint: This is a piece of advice hint: This is a piece of advice
hint: Disable this message with "git config advice.nestedTag false" hint: Disable this message with "git config set advice.nestedTag false"
EOF EOF
test-tool advise "This is a piece of advice" 2>actual && test-tool advise "This is a piece of advice" 2>actual &&
test_cmp expect actual test_cmp expect actual

2
t/t3200-branch.sh
View File

@ -1696,7 +1696,7 @@ test_expect_success 'errors if given a bad branch name' '
cat <<-\EOF >expect && cat <<-\EOF >expect &&
fatal: '\''foo..bar'\'' is not a valid branch name fatal: '\''foo..bar'\'' is not a valid branch name
hint: See `man git check-ref-format` hint: See `man git check-ref-format`
hint: Disable this message with "git config advice.refSyntax false" hint: Disable this message with "git config set advice.refSyntax false"
EOF EOF
test_must_fail git branch foo..bar >actual 2>&1 && test_must_fail git branch foo..bar >actual 2>&1 &&
test_cmp expect actual test_cmp expect actual

6
t/t3404-rebase-interactive.sh
View File

@ -2258,20 +2258,20 @@ test_expect_success 'non-merge commands reject merge commits' '
error: ${SQ}pick${SQ} does not accept merge commits error: ${SQ}pick${SQ} does not accept merge commits
hint: ${SQ}pick${SQ} does not take a merge commit. If you wanted to hint: ${SQ}pick${SQ} does not take a merge commit. If you wanted to
hint: replay the merge, use ${SQ}merge -C${SQ} on the commit. hint: replay the merge, use ${SQ}merge -C${SQ} on the commit.
hint: Disable this message with "git config advice.rebaseTodoError false" hint: Disable this message with "git config set advice.rebaseTodoError false"
error: invalid line 1: pick $oid error: invalid line 1: pick $oid
error: ${SQ}reword${SQ} does not accept merge commits error: ${SQ}reword${SQ} does not accept merge commits
hint: ${SQ}reword${SQ} does not take a merge commit. If you wanted to hint: ${SQ}reword${SQ} does not take a merge commit. If you wanted to
hint: replay the merge and reword the commit message, use hint: replay the merge and reword the commit message, use
hint: ${SQ}merge -c${SQ} on the commit hint: ${SQ}merge -c${SQ} on the commit
hint: Disable this message with "git config advice.rebaseTodoError false" hint: Disable this message with "git config set advice.rebaseTodoError false"
error: invalid line 2: reword $oid error: invalid line 2: reword $oid
error: ${SQ}edit${SQ} does not accept merge commits error: ${SQ}edit${SQ} does not accept merge commits
hint: ${SQ}edit${SQ} does not take a merge commit. If you wanted to hint: ${SQ}edit${SQ} does not take a merge commit. If you wanted to
hint: replay the merge, use ${SQ}merge -C${SQ} on the commit, and then hint: replay the merge, use ${SQ}merge -C${SQ} on the commit, and then
hint: ${SQ}break${SQ} to give the control back to you so that you can hint: ${SQ}break${SQ} to give the control back to you so that you can
hint: do ${SQ}git commit --amend && git rebase --continue${SQ}. hint: do ${SQ}git commit --amend && git rebase --continue${SQ}.
hint: Disable this message with "git config advice.rebaseTodoError false" hint: Disable this message with "git config set advice.rebaseTodoError false"
error: invalid line 3: edit $oid error: invalid line 3: edit $oid
error: cannot squash merge commit into another commit error: cannot squash merge commit into another commit
error: invalid line 4: fixup $oid error: invalid line 4: fixup $oid

2
t/t3501-revert-cherry-pick.sh
View File

@ -177,7 +177,7 @@ test_expect_success 'advice from failed revert' '
hint: You can instead skip this commit with "git revert --skip". hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert", hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort". hint: run "git revert --abort".
hint: Disable this message with "git config advice.mergeConflict false" hint: Disable this message with "git config set advice.mergeConflict false"
EOF EOF
test_commit --append --no-tag "double-add dream" dream dream && test_commit --append --no-tag "double-add dream" dream dream &&
test_must_fail git revert HEAD^ 2>actual && test_must_fail git revert HEAD^ 2>actual &&

6
t/t3507-cherry-pick-conflict.sh
View File

@ -34,7 +34,7 @@ test_expect_success setup '
git commit --allow-empty --allow-empty-message && git commit --allow-empty --allow-empty-message &&
git tag empty && git tag empty &&
git checkout main && git checkout main &&
git config advice.detachedhead false git config set advice.detachedhead false
' '
@ -60,7 +60,7 @@ test_expect_success 'advice from failed cherry-pick' '
hint: You can instead skip this commit with "git cherry-pick --skip". hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick", hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort". hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false" hint: Disable this message with "git config set advice.mergeConflict false"
EOF EOF
test_must_fail git cherry-pick picked 2>actual && test_must_fail git cherry-pick picked 2>actual &&
@ -75,7 +75,7 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
error: could not apply \$picked... picked error: could not apply \$picked... picked
hint: after resolving the conflicts, mark the corrected paths hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>' hint: with 'git add <paths>' or 'git rm <paths>'
hint: Disable this message with \"git config advice.mergeConflict false\" hint: Disable this message with \"git config set advice.mergeConflict false\"
EOF EOF
test_must_fail git cherry-pick --no-commit picked 2>actual && test_must_fail git cherry-pick --no-commit picked 2>actual &&

2
t/t3510-cherry-pick-sequence.sh
View File

@ -25,7 +25,7 @@ pristine_detach () {
} }
test_expect_success setup ' test_expect_success setup '
git config advice.detachedhead false && git config set advice.detachedhead false &&
echo unrelated >unrelated && echo unrelated >unrelated &&
git add unrelated && git add unrelated &&
test_commit initial foo a && test_commit initial foo a &&

2
t/t3511-cherry-pick-x.sh
View File

@ -51,7 +51,7 @@ trailing empty lines
" "
test_expect_success setup ' test_expect_success setup '
git config advice.detachedhead false && git config set advice.detachedhead false &&
echo unrelated >unrelated && echo unrelated >unrelated &&
git add unrelated && git add unrelated &&
test_commit initial foo a && test_commit initial foo a &&

2
t/t3602-rm-sparse-checkout.sh
View File

@ -20,7 +20,7 @@ test_expect_success 'setup' "
hint: If you intend to update such entries, try one of the following: hint: If you intend to update such entries, try one of the following:
hint: * Use the --sparse option. hint: * Use the --sparse option.
hint: * Disable or modify the sparsity rules. hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\" hint: Disable this message with \"git config set advice.updateSparsePath false\"
EOF EOF
echo b | cat sparse_error_header - >sparse_entry_b_error && echo b | cat sparse_error_header - >sparse_entry_b_error &&

6
t/t3700-add.sh
View File

@ -31,7 +31,7 @@ test_expect_success 'Test with no pathspecs' '
cat >expect <<-EOF && cat >expect <<-EOF &&
Nothing specified, nothing added. Nothing specified, nothing added.
hint: Maybe you wanted to say ${SQ}git add .${SQ}? hint: Maybe you wanted to say ${SQ}git add .${SQ}?
hint: Disable this message with "git config advice.addEmptyPathspec false" hint: Disable this message with "git config set advice.addEmptyPathspec false"
EOF EOF
git add 2>actual && git add 2>actual &&
test_cmp expect actual test_cmp expect actual
@ -375,7 +375,7 @@ test_expect_success '"git add" a embedded repository' '
hint: git rm --cached inner1 hint: git rm --cached inner1
hint: hint:
hint: See "git help submodule" for more information. hint: See "git help submodule" for more information.
hint: Disable this message with "git config advice.addEmbeddedRepo false" hint: Disable this message with "git config set advice.addEmbeddedRepo false"
warning: adding embedded git repository: inner2 warning: adding embedded git repository: inner2
EOF EOF
test_cmp expect actual test_cmp expect actual
@ -413,7 +413,7 @@ cat >expect.err <<\EOF
The following paths are ignored by one of your .gitignore files: The following paths are ignored by one of your .gitignore files:
ignored-file ignored-file
hint: Use -f if you really want to add them. hint: Use -f if you really want to add them.
hint: Disable this message with "git config advice.addIgnoredFile false" hint: Disable this message with "git config set advice.addIgnoredFile false"
EOF EOF
cat >expect.out <<\EOF cat >expect.out <<\EOF
add 'track-this' add 'track-this'

2
t/t3705-add-sparse-checkout.sh
View File

@ -54,7 +54,7 @@ test_expect_success 'setup' "
hint: If you intend to update such entries, try one of the following: hint: If you intend to update such entries, try one of the following:
hint: * Use the --sparse option. hint: * Use the --sparse option.
hint: * Disable or modify the sparsity rules. hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\" hint: Disable this message with \"git config set advice.updateSparsePath false\"
EOF EOF
echo sparse_entry | cat sparse_error_header - >sparse_entry_error && echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&

4
t/t7002-mv-sparse-checkout.sh
View File

@ -32,7 +32,7 @@ test_expect_success 'setup' "
hint: If you intend to update such entries, try one of the following: hint: If you intend to update such entries, try one of the following:
hint: * Use the --sparse option. hint: * Use the --sparse option.
hint: * Disable or modify the sparsity rules. hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\" hint: Disable this message with \"git config set advice.updateSparsePath false\"
EOF EOF
cat >dirty_error_header <<-EOF && cat >dirty_error_header <<-EOF &&
@ -45,7 +45,7 @@ test_expect_success 'setup' "
hint: To correct the sparsity of these paths, do the following: hint: To correct the sparsity of these paths, do the following:
hint: * Use \"git add --sparse <paths>\" to update the index hint: * Use \"git add --sparse <paths>\" to update the index
hint: * Use \"git sparse-checkout reapply\" to apply the sparsity rules hint: * Use \"git sparse-checkout reapply\" to apply the sparsity rules
hint: Disable this message with \"git config advice.updateSparsePath false\" hint: Disable this message with \"git config set advice.updateSparsePath false\"
EOF EOF
" "

2
t/t7004-tag.sh
View File

@ -1862,7 +1862,7 @@ test_expect_success 'recursive tagging should give advice' '
hint: already a tag. If you meant to tag the object that it points to, use: hint: already a tag. If you meant to tag the object that it points to, use:
hint: hint:
hint: git tag -f nested annotated-v4.0^{} hint: git tag -f nested annotated-v4.0^{}
hint: Disable this message with "git config advice.nestedTag false" hint: Disable this message with "git config set advice.nestedTag false"
EOF EOF
git tag -m nested nested annotated-v4.0 2>actual && git tag -m nested nested annotated-v4.0 2>actual &&
test_cmp expect actual test_cmp expect actual

4
t/t7201-co.sh
View File

@ -224,7 +224,7 @@ test_expect_success 'switch to another branch while carrying a deletion' '
' '
test_expect_success 'checkout to detach HEAD (with advice declined)' ' test_expect_success 'checkout to detach HEAD (with advice declined)' '
git config advice.detachedHead false && git config set advice.detachedHead false &&
rev=$(git rev-parse --short renamer^) && rev=$(git rev-parse --short renamer^) &&
git checkout -f renamer && git checkout -f renamer &&
git clean -f && git clean -f &&
@ -244,7 +244,7 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
' '
test_expect_success 'checkout to detach HEAD' ' test_expect_success 'checkout to detach HEAD' '
git config advice.detachedHead true && git config set advice.detachedHead true &&
rev=$(git rev-parse --short renamer^) && rev=$(git rev-parse --short renamer^) &&
git checkout -f renamer && git checkout -f renamer &&
git clean -f && git clean -f &&

2
t/t7400-submodule-basic.sh
View File

@ -212,7 +212,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
The following paths are ignored by one of your .gitignore files: The following paths are ignored by one of your .gitignore files:
submod submod
hint: Use -f if you really want to add them. hint: Use -f if you really want to add them.
hint: Disable this message with "git config advice.addIgnoredFile false" hint: Disable this message with "git config set advice.addIgnoredFile false"
EOF EOF
# Does not use test_commit due to the ignore # Does not use test_commit due to the ignore
echo "*" > .gitignore && echo "*" > .gitignore &&

2
t/t7508-status.sh
View File

@ -1699,7 +1699,7 @@ test_expect_success 'setup slow status advice' '
EOF EOF
git add .gitignore && git add .gitignore &&
git commit -m "Add .gitignore" && git commit -m "Add .gitignore" &&
git config advice.statusuoption true git config set advice.statusuoption true
) )
' '