From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Aug 2016 22:10:25 +0000 (-0700)
Subject: Merge branch 'jk/parse-options-concat'
X-Git-Tag: v2.10.0-rc0~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d083d420b7d24a57cfd32af71100ae4c887f3a39;p=thirdparty%2Fgit.git

Merge branch 'jk/parse-options-concat'

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
---

d083d420b7d24a57cfd32af71100ae4c887f3a39