From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Sep 2023 17:07:56 +0000 (-0700)
Subject: Merge branch 'jk/unused-post-2.42-part2'
X-Git-Tag: v2.43.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c52a02a0f0025df0e83ba00dc469df0dc8838b5e;p=thirdparty%2Fgit.git

Merge branch 'jk/unused-post-2.42-part2'

Unused parameters to functions are marked as such, and/or removed,
in order to bring us closer to -Wunused-parameter clean.

* jk/unused-post-2.42-part2:
  parse-options: mark unused parameters in noop callback
  interpret-trailers: mark unused "unset" parameters in option callbacks
  parse-options: add more BUG_ON() annotations
  merge: do not pass unused opt->value parameter
  parse-options: mark unused "opt" parameter in callbacks
  parse-options: prefer opt->value to globals in callbacks
  checkout-index: delay automatic setting of to_tempfile
  format-patch: use OPT_STRING_LIST for to/cc options
  merge: simplify parsing of "-n" option
  merge: make xopts a strvec
---

c52a02a0f0025df0e83ba00dc469df0dc8838b5e