Merge branch 'jk/unused-parameter-fixes'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:53 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:53 +0000 (18:23 +0900)
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

1  2 
builtin/am.c
builtin/cat-file.c
builtin/commit.c
builtin/fetch.c
builtin/grep.c
builtin/pack-objects.c
builtin/update-index.c
midx.c
diff --cc builtin/am.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
Simple merge
diff --cc midx.c
Simple merge