Merge branch 'dl/opt-callback-cleanup'

Code cleanup. * dl/opt-callback-cleanup: Use OPT_CALLBACK and OPT_CALLBACK_F

Junio C Hamano committed May 5, 2020 at 14:54 UTC 66527162008d2792c0000096dd7a41d6d5797df3

No changes.