summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2010-12-05 23:57:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-06 16:51:36 -0800
commit9ca1169fd92c71ebbef92ff18aa5d91a2157d1bd (patch)
treea1490182bae47da917a1d64a3ce1a52dbece0425 /builtin/merge-recursive.c
parentMerge branch 'jl/maint-pull-tags-doc' into maint (diff)
downloadtgif-9ca1169fd92c71ebbef92ff18aa5d91a2157d1bd.tar.xz
parse-options: Don't call parse_options_check() so much
parse_options_check() is being called for each invocation of parse_options_step which can be quite a bit for some commands. The commit introducing this function cb9d398 (parse-options: add parse_options_check to validate option specs., 2009-06-09) had the correct motivation and explicitly states that parse_options_check() should be called from parse_options_start(). However, the implementation differs from the motivation. Fix it. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions