Merge branch 'jt/subprocess-handshake' into maint

diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index b99ae4be8875ad8fb41fd8be2a84b6191681a4e4..175f14797b101d22ead9d1008744440da66a7c1c 100644 (file)
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -20,7 +20,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 {
        int in_place = 0;
        int trim_empty = 0;
-       struct string_list trailers = STRING_LIST_INIT_DUP;
+       struct string_list trailers = STRING_LIST_INIT_NODUP;
 
        struct option options[] = {
                OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),