Merge branch 'jt/test-protocol-version'

diff --git a/trailer.h b/trailer.h
index 06d417fe93c563afe445232afa60193744f6970d..203acf4ee1db99ea35a1d202010834330ce4af58 100644 (file)
--- a/trailer.h
+++ b/trailer.h
@@ -73,6 +73,7 @@ struct process_trailer_options {
        int unfold;
        int no_divider;
        int value_only;
+       const struct strbuf *separator;
        int (*filter)(const struct strbuf *, void *);
        void *filter_data;
 };