diff options
author | René Scharfe <l.s.r@web.de> | 2019-06-22 12:03:40 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-24 12:34:20 -0700 |
commit | 39c575c96967f325a995cf9716a46f7e924714f5 (patch) | |
tree | dbc3d1e379336cd70d43d08a64061f1574dab276 /builtin/merge-ours.c | |
parent | config: don't multiply in parse_unit_factor() (diff) | |
download | tgif-39c575c96967f325a995cf9716a46f7e924714f5.tar.xz |
config: simplify parsing of unit factors
Just return the value of the factor or zero for unrecognized strings
instead of using an output reference and a separate return value to
indicate success. This is shorter and simpler.
It basically reverts that function to before c8deb5a146 ("Improve error
messages when int/long cannot be parsed from config", 2007-12-25), while
keeping the better messages, so restore its old name, get_unit_factor(),
as well.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions