From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:53 +0000 (+0900)
Subject: Merge branch 'jk/unused-parameter-fixes'
X-Git-Tag: v2.20.0-rc0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab96f28ba4deb71ff64b31bd63cee96314db7112;p=thirdparty%2Fgit.git

Merge branch 'jk/unused-parameter-fixes'

Various functions have been audited for "-Wunused-parameter" warnings
and bugs in them got fixed.

* jk/unused-parameter-fixes:
  midx: double-check large object write loop
  assert NOARG/NONEG behavior of parse-options callbacks
  parse-options: drop OPT_DATE()
  apply: return -1 from option callback instead of calling exit(1)
  cat-file: report an error on multiple --batch options
  tag: mark "--message" option with NONEG
  show-branch: mark --reflog option as NONEG
  format-patch: mark "--no-numbered" option with NONEG
  status: mark --find-renames option with NONEG
  cat-file: mark batch options with NONEG
  pack-objects: mark index-version option as NONEG
  ls-files: mark exclude options as NONEG
  am: handle --no-patch-format option
  apply: mark include/exclude options as NONEG
---

ab96f28ba4deb71ff64b31bd63cee96314db7112