diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-09-09 16:37:27 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-09 11:24:52 -0700 |
commit | 0d00da7bb3780c29e3d42ee255e0a09de8c43587 (patch) | |
tree | 372f4687537d115bc5b14af0ee269365b790d37f /mergetools/deltawalker | |
parent | sequencer: lib'ify read_populate_todo() (diff) | |
download | tgif-0d00da7bb3780c29e3d42ee255e0a09de8c43587.tar.xz |
sequencer: lib'ify read_populate_opts()
Instead of dying there, let the caller high up in the callchain notice
the error and handle it (by dying, still).
The only caller of read_populate_opts(), sequencer_continue() can
already return errors, so its caller must be already prepared to
handle error returns, and with this step, we make it notice an error
return from this function.
So this is a safe conversion to make read_populate_opts() callable
from new callers that want it not to die, without changing the
external behaviour of anything existing.
Note that the function git_config_from_file(), called from
read_populate_opts(), can currently still die() (in git_parse_source(),
because the do_config_from_file() function sets die_on_error = 1). We do
not try to fix that here, as it would have larger ramifications on the
config code, and we also assume that we write the opts file
programmatically, hence any parse errors would be bugs.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/deltawalker')
0 files changed, 0 insertions, 0 deletions