Merge branch 'nd/show-gitcomp-compilation-fix' into maint
commitbf29f074ed7019abb53398c4cd5659d9f939d9a8
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:33 +0000 (15 12:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:33 +0000 (15 12:24 +0900)
tree0980dba5e1b347ef0c2fad32cb36923dd64b83c5
parent6be6e6629fe9da1bfef904d2615536ad0db14e1d
parenta92ec7efe0ad25f1c2047230c0324dcb54ce1cfc
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
builtin/blame.c
builtin/shortlog.c
builtin/update-index.c
parse-options.c
parse-options.h