diff options
| author | Patrick Steinhardt <ps@pks.im> | 2016-02-22 11:23:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 18:23:55 (GMT) |
| commit | 3d1806487af395fb33d1de92633e96571b296305 (patch) | |
| tree | c7bc07258511d11eaf29fc9be1386a42688dcbe8 /sequencer.c | |
| parent | 30598ad06f2adfef1f74d6348677358865cbf373 (diff) | |
| download | git-3d1806487af395fb33d1de92633e96571b296305.zip git-3d1806487af395fb33d1de92633e96571b296305.tar.gz git-3d1806487af395fb33d1de92633e96571b296305.tar.bz2 | |
config: rename git_config_set_or_die to git_config_set
Rename git_config_set_or_die functions to git_config_set, leading
to the new default behavior of dying whenever a configuration
error occurs.
By now all callers that shall die on error have been transitioned
to the _or_die variants, thus making this patch a simple rename
of the functions.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sequencer.c b/sequencer.c index 3c109b6..8c58fa2 100644 --- a/sequencer.c +++ b/sequencer.c @@ -933,31 +933,31 @@ static void save_opts(struct replay_opts *opts) const char *opts_file = git_path_opts_file(); if (opts->no_commit) - git_config_set_in_file_or_die(opts_file, "options.no-commit", "true"); + git_config_set_in_file(opts_file, "options.no-commit", "true"); if (opts->edit) - git_config_set_in_file_or_die(opts_file, "options.edit", "true"); + git_config_set_in_file(opts_file, "options.edit", "true"); if (opts->signoff) - git_config_set_in_file_or_die(opts_file, "options.signoff", "true"); + git_config_set_in_file(opts_file, "options.signoff", "true"); if (opts->record_origin) - git_config_set_in_file_or_die(opts_file, "options.record-origin", "true"); + git_config_set_in_file(opts_file, "options.record-origin", "true"); if (opts->allow_ff) - git_config_set_in_file_or_die(opts_file, "options.allow-ff", "true"); + git_config_set_in_file(opts_file, "options.allow-ff", "true"); if (opts->mainline) { struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "%d", opts->mainline); - git_config_set_in_file_or_die(opts_file, "options.mainline", buf.buf); + git_config_set_in_file(opts_file, "options.mainline", buf.buf); strbuf_release(&buf); } if (opts->strategy) - git_config_set_in_file_or_die(opts_file, "options.strategy", opts->strategy); + git_config_set_in_file(opts_file, "options.strategy", opts->strategy); if (opts->gpg_sign) - git_config_set_in_file_or_die(opts_file, "options.gpg-sign", opts->gpg_sign); + git_config_set_in_file(opts_file, "options.gpg-sign", opts->gpg_sign); if (opts->xopts) { int i; for (i = 0; i < opts->xopts_nr; i++) - git_config_set_multivar_in_file_or_die(opts_file, - "options.strategy-option", - opts->xopts[i], "^$", 0); + git_config_set_multivar_in_file(opts_file, + "options.strategy-option", + opts->xopts[i], "^$", 0); } } |