summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Charles Bailey <cbailey32@bloomberg.net>2015-06-21 19:25:44 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-22 15:07:21 -0700
commit2a514ed8058e35841d3d7b05a898991b83e5eaf0 (patch)
treeeb121b83543970a0f21988d5f301743692e788b3 /git-mergetool.sh
parenttest-parse-options: update to handle negative ints (diff)
downloadtgif-2a514ed8058e35841d3d7b05a898991b83e5eaf0.tar.xz
parse-options: move unsigned long option parsing out of pack-objects.c
The unsigned long option parsing (including 'k'/'m'/'g' suffix parsing) is more widely applicable. Add support for OPT_MAGNITUDE to parse-options.h and change pack-objects.c use this support. The error behavior on parse errors follows that of OPT_INTEGER. The name of the option that failed to parse is reported with a brief message describing the expect format for the option argument and then the full usage message for the command invoked. This differs from the previous behavior for OPT_ULONG used in pack-objects for --max-pack-size and --window-memory which used to display the value supplied in the error message and did not display the full usage message. Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions