Merge branch 'rs/grep-no-recursive'

diff --git a/ref-filter.c b/ref-filter.c
index 9bacd32f0a0a72854c81d0d114520efb554c04a8..2a056192117b0d119dcd4cf9da0de982a0444b33 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -264,6 +264,8 @@ static int trailers_atom_parser(const struct ref_format *format, struct used_ato
        struct string_list params = STRING_LIST_INIT_DUP;
        int i;
 
+       atom->u.contents.trailer_opts.no_divider = 1;
+
        if (arg) {
                string_list_split(&params, arg, ',', -1);
                for (i = 0; i < params.nr; i++) {
@@ -2008,7 +2010,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
        struct ref_array *array = ref_cbdata->array;
        struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr);
 
-       init_revisions(&revs, NULL);
+       repo_init_revisions(the_repository, &revs, NULL);
 
        for (i = 0; i < array->nr; i++) {
                struct ref_array_item *item = array->items[i];