Merge branch 'nd/the-index' into md/list-objects-filter-by-depth

diff --git a/builtin/notes.c b/builtin/notes.c
index c78b7a0c5b7fbea81320ae9873553c437d82e73e..4996a670f71333de09e1a0311fde85d6985c9c91 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -813,7 +813,7 @@ static int merge(int argc, const char **argv, const char *prefix)
                usage_with_options(git_notes_merge_usage, options);
        }
 
-       init_notes_merge_options(&o);
+       init_notes_merge_options(the_repository, &o);
        o.verbosity = verbosity + NOTES_MERGE_VERBOSITY_DEFAULT;
 
        if (do_abort)