Merge branch 'sm/show-superproject-while-conflicted'

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 247881189fde2a910bbd993342bb74fe10e06b0e..80474c3ff5651f06df3394cb3f059ac0d7cb19f8 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -792,7 +792,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
                         path, NULL);
 
        git_config(git_diff_basic_config, NULL);
-       init_revisions(&rev, prefix);
+       repo_init_revisions(the_repository, &rev, prefix);
        rev.abbrev = 0;
        diff_files_args.argc = setup_revisions(diff_files_args.argc,
                                               diff_files_args.argv,