diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-11-27 21:12:55 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-29 15:15:17 +0900 |
commit | 8821e90a09a6b86b92213882f3b9945bc21b94d1 (patch) | |
tree | 7ad44326a26b847e48df28612615dc6a218efba5 /Documentation/git-merge-index.txt | |
parent | Git 2.19.2 (diff) | |
download | tgif-8821e90a09a6b86b92213882f3b9945bc21b94d1.tar.xz |
advice: don't pointlessly suggest --convert-graft-file
The advice to run 'git replace --convert-graft-file' added in
f9f99b3f7d ("Deprecate support for .git/info/grafts", 2018-04-29)
didn't add an exception for the 'git replace --convert-graft-file'
codepath itself.
As a result we'd suggest running --convert-graft-file while the user
was running --convert-graft-file, which makes no sense. Before:
$ git replace --convert-graft-file
hint: Support for <GIT_DIR>/info/grafts is deprecated
hint: and will be removed in a future Git version.
hint:
hint: Please use "git replace --convert-graft-file"
hint: to convert the grafts into replace refs.
hint:
hint: Turn this message off by running
hint: "git config advice.graftFileDeprecated false"
Add a check for that case and skip printing the advice while the user
is busy following our advice.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions