From: Junio C Hamano Date: Wed, 10 Aug 2016 18:55:23 +0000 (-0700) Subject: Merge branch 'jk/parse-options-concat' into maint X-Git-Tag: v2.9.3~19 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60b84ba26c588c09759b90b96e072cceb862a859?ds=inline;hp=--cc Merge branch 'jk/parse-options-concat' into maint Users of the parse_options_concat() API function need to allocate extra slots in advance and fill them with OPT_END() when they want to decide the set of supported options dynamically, which makes the code error-prone and hard to read. This has been corrected by tweaking the API to allocate and return a new copy of "struct option" array. * jk/parse-options-concat: parse_options: allocate a new array when concatenating --- 60b84ba26c588c09759b90b96e072cceb862a859