Sync with 2.19.1

diff --git a/ref-filter.c b/ref-filter.c
index 9bacd32f0a0a72854c81d0d114520efb554c04a8..e1bcb4ca8a1977e97b26da47962dfcd3781a021e 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++) {