Merge branch 'en/t6036-recursive-corner-cases'

diff --git a/builtin/replace.c b/builtin/replace.c
index 6da2411e14b9f94f309671e14124ef32d89ef528..deabda210127087188117e394e453373fa48991f 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -487,7 +487,7 @@ static int create_graft(int argc, const char **argv, int force, int gentle)
 
 static int convert_graft_file(int force)
 {
-       const char *graft_file = get_graft_file();
+       const char *graft_file = get_graft_file(the_repository);
        FILE *fp = fopen_or_warn(graft_file, "r");
        struct strbuf buf = STRBUF_INIT, err = STRBUF_INIT;
        struct argv_array args = ARGV_ARRAY_INIT;