diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-01 12:41:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-01 12:41:42 (GMT) |
| commit | 671e629d6eab689cb685fb375997c60b2cbcbab7 (patch) | |
| tree | 124921a060aae857a641160c23f9e8976f5cf3b0 /t | |
| parent | 881d72eff8b0d23c8edc6f8d9673f8daafaace6f (diff) | |
| parent | 8821e90a09a6b86b92213882f3b9945bc21b94d1 (diff) | |
| download | git-671e629d6eab689cb685fb375997c60b2cbcbab7.zip git-671e629d6eab689cb685fb375997c60b2cbcbab7.tar.gz git-671e629d6eab689cb685fb375997c60b2cbcbab7.tar.bz2 | |
Merge branch 'ab/replace-graft-with-replace-advice'
The advice message to tell the user to migrate an existing graft
file to the replace system when a graft file was read was shown
even when "git replace --convert-graft-file" command, which is the
way the message suggests to use, was running, which made little
sense.
* ab/replace-graft-with-replace-advice:
advice: don't pointlessly suggest --convert-graft-file
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" && |