diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-11-27 20:12:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-29 06:15:17 (GMT) |
| commit | 8821e90a09a6b86b92213882f3b9945bc21b94d1 (patch) | |
| tree | 7ad44326a26b847e48df28612615dc6a218efba5 /t | |
| parent | 98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad (diff) | |
| download | git-8821e90a09a6b86b92213882f3b9945bc21b94d1.zip git-8821e90a09a6b86b92213882f3b9945bc21b94d1.tar.gz git-8821e90a09a6b86b92213882f3b9945bc21b94d1.tar.bz2 | |
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 't')
| -rwxr-xr-x | t/t6050-replace.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 86374a9..5d6d318 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -461,7 +461,10 @@ test_expect_success '--convert-graft-file' ' printf "%s\n%s %s\n\n# comment\n%s\n" \ $(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \ >.git/info/grafts && - git replace --convert-graft-file && + git status 2>stderr && + test_i18ngrep "hint:.*grafts is deprecated" stderr && + git replace --convert-graft-file 2>stderr && + test_i18ngrep ! "hint:.*grafts is deprecated" stderr && test_path_is_missing .git/info/grafts && : verify that the history is now "grafted" && |