Merge branch 'nd/show-gitcomp-compilation-fix' into maint

Portability fix for a recent update to parse-options API.

* nd/show-gitcomp-compilation-fix:
  parse-options: fix SunCC compiler warning

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/shortlog.c
Simple merge

diff --cc builtin/update-index.c
Simple merge

diff --cc parse-options.c
Simple merge

diff --cc parse-options.h
Simple merge