diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-13 10:37:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-13 10:37:48 -0700 |
| commit | 7013220d2b3181d4ae55e21e0f18b9abfd6e011d (patch) | |
| tree | 4ceb8a1c5dd10047c7d9b59a30e9687cc7fc8372 /builtin/interpret-trailers.c | |
| parent | e059388fb200fb2b5281ce211242ef3525a9c2c7 (diff) | |
| parent | 64093fc06a871f71316211a2aea6bb46c49b20ab (diff) | |
| download | git-7013220d2b3181d4ae55e21e0f18b9abfd6e011d.tar.gz | |
Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
* jk/parseopt-string-list:
blame,shortlog: don't make local option variables static
interpret-trailers: don't duplicate option strings
parse_opt_string_list: stop allocating new strings
Diffstat (limited to 'builtin/interpret-trailers.c')
| -rw-r--r-- | builtin/interpret-trailers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index b99ae4be88..175f14797b 100644 --- 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")), |