Merge branch 'jk/trailer-fixes' into maint

diff --git a/ref-filter.c b/ref-filter.c
index 0bccfceff2ae31200019838d9f2b67e13e32ef6f..3e8ee04d09b2271ea9b0a9a07de6ec932ad09387 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -263,6 +263,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++) {