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:
@ -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;
|
||||
|
Reference in New Issue
Block a user