summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-12-01 12:41:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-12-01 12:41:42 (GMT)
commit671e629d6eab689cb685fb375997c60b2cbcbab7 (patch)
tree124921a060aae857a641160c23f9e8976f5cf3b0 /builtin/replace.c
parent881d72eff8b0d23c8edc6f8d9673f8daafaace6f (diff)
parent8821e90a09a6b86b92213882f3b9945bc21b94d1 (diff)
downloadgit-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 'builtin/replace.c')
-rw-r--r--builtin/replace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index a58b9c6..affcdfb 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -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;