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
This commit is contained in:
Junio C Hamano
2018-12-01 21:41:42 +09:00
2 changed files with 5 additions and 1 deletions

View File

@ -495,6 +495,7 @@ static int convert_graft_file(int force)
if (!fp)
return -1;
advice_graft_file_deprecated = 0;
while (strbuf_getline(&buf, fp) != EOF) {
if (*buf.buf == '#')
continue;