Merge branch 'nd/diff-parseopt'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:44 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:44 +0000 (10:50 -0700)
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

1  2 
diff.c
diff.h
parse-options-cb.c
parse-options.c
t/t4013-diff-various.sh
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
Simple merge
diff --cc parse-options.c
Simple merge
Simple merge