From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2022 02:46:17 +0000 (+0900)
Subject: Merge branch 'rs/diff-parseopts'
X-Git-Tag: v2.40.0-rc0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab91f6b7c42;p=thirdparty%2Fgit.git

Merge branch 'rs/diff-parseopts'

The way the diff machinery prepares the options array for the
parse_options API has been refactored to avoid resource leaks.

* rs/diff-parseopts:
  diff: remove parseopts member from struct diff_options
  diff: use add_diff_options() in diff_opt_parse()
  diff: factor out add_diff_options()
---

ab91f6b7c42531406bcca0e48c48530126332142