From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 May 2019 17:50:44 +0000 (-0700)
Subject: Merge branch 'nd/diff-parseopt'
X-Git-Tag: v2.22.0-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20aa7c594fbc2e36476daae2f53d7c020306c62c;p=thirdparty%2Fgit.git

Merge branch 'nd/diff-parseopt'

A brown-paper-bag bugfix to a change already in 'master'.

* nd/diff-parseopt:
  parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
  diff-parseopt: restore -U (no argument) behavior
  diff-parseopt: correct variable types that are used by parseopt
---

20aa7c594fbc2e36476daae2f53d7c020306c62c